Merge pull request #33 from coopnorge/do-not-user-name-as-external-na…

…me-in-repo feat: repository - do not use name as provider [breaking]
crossplane-contrib · Dec 19, 2023 · ca47afe · ca47afe
2 parents 38227bd + 4739db7
commit ca47afe
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 4 deletions.
diff --git a/apis/repo/v1alpha1/zz_generated.deepcopy.go b/apis/repo/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/repo/v1alpha1/zz_repository_types.go b/apis/repo/v1alpha1/zz_repository_types.go
diff --git a/config/external_name.go b/config/external_name.go
@@ -10,7 +10,7 @@ import "github.com/upbound/upjet/pkg/config"
 // provider.
 var ExternalNameConfigs = map[string]config.ExternalName{
 	// Imported by using the following format: {{name}}
-	"github_repository": config.NameAsIdentifier,
+	"github_repository": config.IdentifierFromProvider,
 	// Imported by using the following format: {{ repository }}:{{ name }}:{{ source branch }}
 	"github_branch": config.TemplatedStringAsIdentifier("branch", "{{ .parameters.repository }}:{{ .external_name }}:{{ .parameters.source_branch }}"),
 	// Imported by using the following format: {{ repository }}

diff --git a/examples-generated/repo/branchprotection.yaml b/examples-generated/repo/branchprotection.yaml
@@ -42,7 +42,8 @@ metadata:
     testing.upbound.io/example-name: example
   name: example
 spec:
-  forProvider: {}
+  forProvider:
+    name: test
 
 ---
 

diff --git a/examples-generated/repo/defaultbranch.yaml b/examples-generated/repo/defaultbranch.yaml
@@ -42,6 +42,7 @@ spec:
   forProvider:
     autoInit: true
     description: My awesome codebase
+    name: example
 
 ---
 
diff --git a/examples-generated/repo/repository.yaml b/examples-generated/repo/repository.yaml
@@ -9,6 +9,7 @@ metadata:
 spec:
   forProvider:
     description: My awesome codebase
+    name: example
     template:
     - includeAllBranches: true
       owner: github

diff --git a/examples-generated/repo/repositoryfile.yaml b/examples-generated/repo/repositoryfile.yaml
@@ -34,6 +34,7 @@ metadata:
 spec:
   forProvider:
     autoInit: true
+    name: tf-acc-test-%s
 
 ---
 
diff --git a/examples-generated/team/teamrepository.yaml b/examples-generated/team/teamrepository.yaml
@@ -27,7 +27,8 @@ metadata:
     testing.upbound.io/example-name: some_repo
   name: some-repo
 spec:
-  forProvider: {}
+  forProvider:
+    name: some-repo
 
 ---
 

diff --git a/internal/controller/repo/repository/zz_controller.go b/internal/controller/repo/repository/zz_controller.go
diff --git a/package/crds/repo.github.upbound.io_repositories.yaml b/package/crds/repo.github.upbound.io_repositories.yaml
@@ -161,6 +161,9 @@ spec:
                     description: Can be PR_TITLE or MERGE_MESSAGE for a default merge
                       commit title.
                     type: string
+                  name:
+                    description: The name of the repository.
+                    type: string
                   pages:
                     description: The repository's GitHub Pages configuration. See
                       GitHub Pages Configuration below for details.
@@ -310,6 +313,8 @@ spec:
                       alerts have not been successfully tested on any GitHub Enterprise
                       instance and may be unavailable in those settings.'
                     type: boolean
+                required:
+                - name
                 type: object
               providerConfigRef:
                 default: