From 100c7f1eb2b1f1c834eba994957742d48a14d830 Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Mon, 31 Jul 2023 10:13:02 +0300 Subject: [PATCH] Fix config.Provider.RootGroup field docs Signed-off-by: Alper Rifat Ulucinar --- docs/generating-a-provider.md | 4 ++-- docs/images/upjet-externalname.excalidraw | 4 ++-- pkg/config/provider.go | 4 ++-- pkg/pipeline/run.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/generating-a-provider.md b/docs/generating-a-provider.md index 6bfa5e1f..035ebe8e 100644 --- a/docs/generating-a-provider.md +++ b/docs/generating-a-provider.md @@ -326,10 +326,10 @@ Now let's test our generated resources. ```bash NAME READY SYNCED EXTERNAL-NAME AGE - branch.branch.github.jet.crossplane.io/hello-upjet True True hello-crossplane:hello-upjet 89s + branch.branch.github.upbound.io/hello-upjet True True hello-crossplane:hello-upjet 89s NAME READY SYNCED EXTERNAL-NAME AGE - repository.repository.github.jet.crossplane.io/hello-crossplane True True hello-crossplane 89s + repository.repository.github.upbound.io/hello-crossplane True True hello-crossplane 89s ``` Verify that repo `hello-crossplane` and branch `hello-upjet` created under diff --git a/docs/images/upjet-externalname.excalidraw b/docs/images/upjet-externalname.excalidraw index 83ace476..06786d16 100644 --- a/docs/images/upjet-externalname.excalidraw +++ b/docs/images/upjet-externalname.excalidraw @@ -188,12 +188,12 @@ "updated": 1640767155602, "fontSize": 16, "fontFamily": 3, - "text": "apiVersion: sql.azure.jet.crossplane.io/v1alpha1\nkind: Server\nmetadata:\n name: myserver\n annotations:\n crossplane.io/external-name: myserver\nspec:\n forProvider:\n ...\n resourceGroupNameRef:\n name: myresourcegroup\n providerConfigRef:\n name: example", + "text": "apiVersion: sql.azure.upbound.io/v1alpha1\nkind: Server\nmetadata:\n name: myserver\n annotations:\n crossplane.io/external-name: myserver\nspec:\n forProvider:\n ...\n resourceGroupNameRef:\n name: myresourcegroup\n providerConfigRef:\n name: example", "baseline": 243, "textAlign": "left", "verticalAlign": "top", "containerId": null, - "originalText": "apiVersion: sql.azure.jet.crossplane.io/v1alpha1\nkind: Server\nmetadata:\n name: myserver\n annotations:\n crossplane.io/external-name: myserver\nspec:\n forProvider:\n ...\n resourceGroupNameRef:\n name: myresourcegroup\n providerConfigRef:\n name: example" + "originalText": "apiVersion: sql.azure.upbound.io/v1alpha1\nkind: Server\nmetadata:\n name: myserver\n annotations:\n crossplane.io/external-name: myserver\nspec:\n forProvider:\n ...\n resourceGroupNameRef:\n name: myresourcegroup\n providerConfigRef:\n name: example" }, { "id": "5TV10V0jD_m7Ba68DZ2fG", diff --git a/pkg/config/provider.go b/pkg/config/provider.go index 40309c57..56664ef5 100644 --- a/pkg/config/provider.go +++ b/pkg/config/provider.go @@ -61,8 +61,8 @@ type Provider struct { TerraformResourcePrefix string // RootGroup is the root group that all CRDs groups in the provider are based - // on, e.g. "aws.jet.crossplane.io". - // Defaults to ".jet.crossplane.io". + // on, e.g. "aws.upbound.io". + // Defaults to ".upbound.io". RootGroup string // ShortName is the short name of the provider. Typically, added as a CRD diff --git a/pkg/pipeline/run.go b/pkg/pipeline/run.go index 58313f5c..a2cd4ca0 100644 --- a/pkg/pipeline/run.go +++ b/pkg/pipeline/run.go @@ -30,7 +30,7 @@ func Run(pc *config.Provider, rootDir string) { // nolint:gocyclo // Group resources based on their Group and API Versions. // An example entry in the tree would be: - // ec2.awsjet.crossplane.io -> v1alpha1 -> aws_vpc + // ec2.aws.upbound.io -> v1beta1 -> aws_vpc resourcesGroups := map[string]map[string]map[string]*config.Resource{} for name, resource := range pc.Resources { group := pc.RootGroup