update some names for registry #11506
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,6 +43,7 @@ import ( | |
| "github.com/pulumi/pulumi/pkg/v3/codegen/nodejs" | ||
| "github.com/pulumi/pulumi/pkg/v3/codegen/python" | ||
| "github.com/pulumi/pulumi/pkg/v3/codegen/schema" | ||
| "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" | ||
| ) | ||
|
|
||
| //go:embed templates/*.tmpl | ||
|
|
@@ -61,6 +62,7 @@ func titleLookup(shortName string) (string, bool) { | |
| "alicloud": "Alibaba Cloud", | ||
| "auth0": "Auth0", | ||
| "aws": "AWS Classic", | ||
| "awsx": "AWSx (Pulumi Crosswalk for AWS)", | ||
| "aws-apigateway": "AWS API Gateway", | ||
| "aws-miniflux": "Miniflux", | ||
| "aws-native": "AWS Native", | ||
|
|
@@ -71,20 +73,21 @@ func titleLookup(shortName string) (string, bool) { | |
| "aws-quickstart-vpc": "AWS QuickStart VPC", | ||
| "aws-s3-replicated-bucket": "AWS S3 Replicated Bucket", | ||
| "azure": "Azure Classic", | ||
| "azure-justrun": "Azure Justrun", | ||
| "azure-native": "Azure Native", | ||
| "azure-quickstart-acr-geo-replication": "Azure QuickStart ACR Geo Replication", | ||
| "azure-quickstart-aks": "Azure QuickStart AKS", | ||
| "azure-quickstart-compute": "Azure QuickStart Compute", | ||
| "azure-quickstart-sql": "Azure QuickStart SQL", | ||
| "azuread": "Azure Active Directory (Azure AD)", | ||
| "azuredevops": "Azure DevOps", | ||
| "azuresel": "Azure", | ||
| "civo": "Civo", | ||
| "cloudamqp": "CloudAMQP", | ||
| "cloudflare": "Cloudflare", | ||
| "cloudinit": "cloud-init", | ||
| "confluent": "Confluent Cloud", | ||
| "consul": "HashiCorp Consul", | ||
| "coredns-helm": "CoreDNS (Helm)", | ||
| "datadog": "Datadog", | ||
| "digitalocean": "DigitalOcean", | ||
|
|
@@ -95,7 +98,7 @@ func titleLookup(shortName string) (string, bool) { | |
| "equinix-metal": "Equinix Metal", | ||
| "f5bigip": "f5 BIG-IP", | ||
| "fastly": "Fastly", | ||
| "gcp": "Google Cloud (GCP) Classic", | ||
| "gcp-global-cloudrun": "Google Global Cloud Run", | ||
| "gcp-project-scaffold": "Google Project Scaffolding", | ||
| "google-native": "Google Cloud Native", | ||
|
|
@@ -119,7 +122,7 @@ func titleLookup(shortName string) (string, bool) { | |
| "kubernetes-ingress-nginx": "NGINX Ingress Controller (Helm)", | ||
| "kubernetes-coredns": "CoreDNS (Helm)", | ||
| "kubernetes-cert-manager": "Jetstack Cert Manager (Helm)", | ||
| "nomad": "HashiCorp Nomad", | ||
| "ns1": "NS1", | ||
| "okta": "Okta", | ||
| "openstack": "OpenStack", | ||
|
|
@@ -1558,14 +1561,12 @@ func (mod *modContext) genResource(r *schema.Resource) resourceDocArgs { | |
| filteredOutputProps = filterOutputProperties(r.InputProperties, r.Properties) | ||
| } | ||
|
|
||
| // All resources have an implicit `id` output property, that we must inject into the docs. | ||
| filteredOutputProps = append(filteredOutputProps, &schema.Property{ | ||
| Name: "id", | ||
| Comment: "The provider-assigned unique ID for this managed resource.", | ||
| Type: schema.StringType, | ||
| }) | ||
|
|
||
| for _, lang := range dctx.supportedLanguages { | ||
| inputProps[lang] = mod.getProperties(r.InputProperties, lang, true, false, r.IsProvider) | ||
|
|
@@ -1691,6 +1692,14 @@ func (mod *modContext) getTypes(member interface{}, types nestedTypeUsageInfo) { | |
| } | ||
| } | ||
|
|
||
| type fs map[string][]byte | ||
|
|
||
| func (fs fs) add(path string, contents []byte) { | ||
| _, has := fs[path] | ||
| contract.Assertf(!has, "duplicate file: %s", path) | ||
| fs[path] = contents | ||
| } | ||
|
|
||
|
Comment on lines
+1695
to
+1702
There was a problem hiding this comment. Also, all the rest of the changes related to There was a problem hiding this comment. @justinvp I could use your help on Monday. all of these came from what I thought was the right gen command to run, which was obviously wrong. There was a problem hiding this comment. well nevermind, i started over and its clean, going to close this in favor of #11525 |
||
| // getModuleFileName returns the file name to use for a module. | ||
| func (mod *modContext) getModuleFileName() string { | ||
| dctx := mod.docGenContext | ||
|
|
@@ -1706,13 +1715,13 @@ func (mod *modContext) getModuleFileName() string { | |
| return mod.mod | ||
| } | ||
|
|
||
| func (mod *modContext) gen(fs fs) error { | ||
| dctx := mod.docGenContext | ||
| modName := mod.getModuleFileName() | ||
|
|
||
| addFile := func(name, contents string) { | ||
| p := path.Join(modName, name, "_index.md") | ||
| fs.add(p, []byte(contents)) | ||
| } | ||
|
|
||
| // Resources | ||
|
|
@@ -1751,7 +1760,7 @@ func (mod *modContext) gen(fs codegen.Fs) error { | |
| return err | ||
| } | ||
|
|
||
| fs.add(path.Join(modName, "_index.md"), buffer.Bytes()) | ||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -2083,7 +2092,7 @@ func (dctx *docGenContext) generatePackage(tool string, pkg *schema.Package) (ma | |
| defer glog.Flush() | ||
|
|
||
| glog.V(3).Infoln("generating package docs now...") | ||
| files := fs{} | ||
| modules := []string{} | ||
| modMap := dctx.modules() | ||
| for k := range modMap { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change needs to be removed from this PR. We should not be including the
idproperty for components. I just recently fixed this in #11469