Merge pull request #559 from ytsarev/key-vault-non-k8s-name

[KeyVault]: Allow non RFC1123 name for Key,Secret,Certificate
crossplane-contrib · Sep 28, 2023 · 2f0bdda · 2f0bdda
2 parents 9ffc153 + 13268db
commit 2f0bdda
Show file tree

Hide file tree

Showing 28 changed files with 147 additions and 9 deletions.
diff --git a/apis/keyvault/v1beta1/zz_certificate_types.go b/apis/keyvault/v1beta1/zz_certificate_types.go
diff --git a/apis/keyvault/v1beta1/zz_generated.deepcopy.go b/apis/keyvault/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/keyvault/v1beta1/zz_key_types.go b/apis/keyvault/v1beta1/zz_key_types.go
diff --git a/apis/keyvault/v1beta1/zz_secret_types.go b/apis/keyvault/v1beta1/zz_secret_types.go
diff --git a/config/externalname.go b/config/externalname.go
@@ -1860,10 +1860,7 @@ var ExternalNameConfigs = map[string]config.ExternalName{
 }
 
 func keyVaultURLIDConf(resourceType string) config.ExternalName {
-	e := config.NameAsIdentifier
-	e.SetIdentifierArgumentFn = func(base map[string]any, externalName string) {
-		base["name"] = strings.Split(externalName, "/")[0]
-	}
+	e := config.IdentifierFromProvider
 	e.GetExternalNameFn = func(tfstate map[string]any) (string, error) {
 		id, ok := tfstate["id"]
 		if !ok {

diff --git a/examples-generated/appplatform/springcloudcertificate.yaml b/examples-generated/appplatform/springcloudcertificate.yaml
@@ -77,6 +77,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: cert-example
 
 ---
 

diff --git a/examples-generated/compute/diskencryptionset.yaml b/examples-generated/compute/diskencryptionset.yaml
@@ -120,6 +120,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: des-example-key
 
 ---
 

diff --git a/examples-generated/databricks/workspacecustomermanagedkey.yaml b/examples-generated/databricks/workspacecustomermanagedkey.yaml
@@ -137,6 +137,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: example-certificate
 
 ---
 

diff --git a/examples-generated/dataprotection/backupinstancepostgresql.yaml b/examples-generated/dataprotection/backupinstancepostgresql.yaml
@@ -100,6 +100,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: example
     valueSecretRef:
       key: example
       name: example-postgresql-server

diff --git a/examples-generated/dbforpostgresql/serverkey.yaml b/examples-generated/dbforpostgresql/serverkey.yaml
@@ -118,6 +118,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: tfex-key
 
 ---
 

diff --git a/examples-generated/keyvault/certificate.yaml b/examples-generated/keyvault/certificate.yaml
@@ -20,6 +20,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: imported-cert
 
 ---
 

diff --git a/examples-generated/keyvault/key.yaml b/examples-generated/keyvault/key.yaml
@@ -20,6 +20,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: generated-certificate
     rotationPolicy:
     - automatic:
       - timeBeforeExpiry: P30D

diff --git a/examples-generated/keyvault/secret.yaml b/examples-generated/keyvault/secret.yaml
@@ -11,6 +11,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: secret-sauce
     valueSecretRef:
       key: example-key
       name: example-secret

diff --git a/examples-generated/synapse/workspaceaadadmin.yaml b/examples-generated/synapse/workspaceaadadmin.yaml
@@ -79,6 +79,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: workspace-encryption-key
 
 ---
 

diff --git a/examples-generated/synapse/workspacesqlaadadmin.yaml b/examples-generated/synapse/workspacesqlaadadmin.yaml
@@ -79,6 +79,7 @@ spec:
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
+    name: workspace-encryption-key
 
 ---
 

diff --git a/examples/databricks/workspacecustomermanagedkey.yaml b/examples/databricks/workspacecustomermanagedkey.yaml
@@ -130,6 +130,7 @@ metadata:
   name: examplekey
 spec:
   forProvider:
+    name: exampleKey
     keyOpts:
     - decrypt
     - encrypt

diff --git a/examples/dataprotection/backupinstancepostgresql.yaml b/examples/dataprotection/backupinstancepostgresql.yaml
@@ -102,6 +102,7 @@ metadata:
   name: example-backupinstancepostgresql
 spec:
   forProvider:
+    name: exampleBackupInstancePostgresql
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example

diff --git a/examples/dbforpostgresql/server-key.yaml b/examples/dbforpostgresql/server-key.yaml
@@ -105,6 +105,7 @@ metadata:
   name: example
 spec:
   forProvider:
+    name: exampleKey
     keyOpts:
     - decrypt
     - encrypt

diff --git a/examples/keyvault/certificate.yaml b/examples/keyvault/certificate.yaml
@@ -8,6 +8,7 @@ metadata:
   name: uptest-${Rand.RFC1123Subdomain}
 spec:
   forProvider:
+    name: custom-Non-RFC1123Name
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example-cert

diff --git a/examples/keyvault/key.yaml b/examples/keyvault/key.yaml
@@ -8,6 +8,7 @@ metadata:
   name: uptest-${Rand.RFC1123Subdomain}
 spec:
   forProvider:
+    name: custom-Non-RFC1123Name
     keyOpts:
       - decrypt
       - encrypt

diff --git a/examples/keyvault/secret.yaml b/examples/keyvault/secret.yaml
@@ -8,6 +8,7 @@ metadata:
   name: uptest-${Rand.RFC1123Subdomain}
 spec:
   forProvider:
+    name: custom-Non-RFC1123Name
     keyVaultIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example

diff --git a/examples/synapse/workspacesqlaadadmin.yaml b/examples/synapse/workspacesqlaadadmin.yaml
@@ -74,6 +74,7 @@ metadata:
     testing.upbound.io/example-name: wssqlaadadmin-key
   name: wssqlaadadmin-key
 spec:
+  name: workspace-encryption-key
   forProvider:
     keyOpts:
     - unwrapKey

diff --git a/internal/controller/keyvault/certificate/zz_controller.go b/internal/controller/keyvault/certificate/zz_controller.go
diff --git a/internal/controller/keyvault/key/zz_controller.go b/internal/controller/keyvault/key/zz_controller.go