Support []string and map[string]string secret properties (Azure#3744)

This resolves Azure#3435. []string is transformed into []genruntime.SecretReference. map[string]string is transformed into a new type genruntime.SecretCollectionReference. Unlike genruntime.SecretReference, SecretCollectionReference refers to an entire secret rather than only some parts of it. This is required to keep the keys of the map secret too. It also presents a slightly cleaner user interface than map[string]genruntime.SecretReference would have.
ansulgoenka · Jan 31, 2024 · 27e6a82 · 27e6a82
1 parent ae0d185
commit 27e6a82
Show file tree

Hide file tree

Showing 33 changed files with 852 additions and 71 deletions.
diff --git a/v2/api/containerinstance/v1api20211001/container_group_spec_arm_types_gen.go b/v2/api/containerinstance/v1api20211001/container_group_spec_arm_types_gen.go
diff --git a/v2/api/containerinstance/v1api20211001/container_group_spec_arm_types_gen_test.go b/v2/api/containerinstance/v1api20211001/container_group_spec_arm_types_gen_test.go
diff --git a/v2/api/containerinstance/v1api20211001/container_group_types_gen.go b/v2/api/containerinstance/v1api20211001/container_group_types_gen.go
diff --git a/v2/api/containerinstance/v1api20211001/structure.txt b/v2/api/containerinstance/v1api20211001/structure.txt
@@ -83,7 +83,7 @@ github.com/Azure/azure-service-operator/v2/api/containerinstance/v1api20211001
 │   │   │       │   └── "ContainerInstanceLogs"
 │   │   │       ├── Metadata: map[string]string
 │   │   │       ├── WorkspaceId: *string
-│   │   │       ├── WorkspaceKey: genruntime.SecretReference
+│   │   │       ├── WorkspaceKey: *genruntime.SecretReference
 │   │   │       └── WorkspaceResourceReference: *genruntime.ResourceReference
 │   │   ├── DnsConfig: *Object (3 properties)
 │   │   │   ├── NameServers: string[]
@@ -687,7 +687,7 @@ github.com/Azure/azure-service-operator/v2/api/containerinstance/v1api20211001
     │   │       │   └── "ContainerInstanceLogs"
     │   │       ├── Metadata: map[string]string
     │   │       ├── WorkspaceId: *string
-    │   │       ├── WorkspaceKey: string
+    │   │       ├── WorkspaceKey: *string
     │   │       └── WorkspaceResourceId: *string
     │   ├── DnsConfig: *Object (3 properties)
     │   │   ├── NameServers: string[]

diff --git a/v2/api/containerinstance/v1api20211001/zz_generated.deepcopy.go b/v2/api/containerinstance/v1api20211001/zz_generated.deepcopy.go
diff --git a/v2/api/dbformariadb/v1api20180601/server_spec_arm_types_gen.go b/v2/api/dbformariadb/v1api20180601/server_spec_arm_types_gen.go
diff --git a/v2/api/dbformariadb/v1api20180601/server_spec_arm_types_gen_test.go b/v2/api/dbformariadb/v1api20180601/server_spec_arm_types_gen_test.go
diff --git a/v2/api/dbformariadb/v1api20180601/server_types_gen.go b/v2/api/dbformariadb/v1api20180601/server_types_gen.go
diff --git a/v2/api/dbformariadb/v1api20180601/structure.txt b/v2/api/dbformariadb/v1api20180601/structure.txt
@@ -46,7 +46,7 @@ github.com/Azure/azure-service-operator/v2/api/dbformariadb/v1api20180601
 │   │   ├── Properties: *Object (4 properties)
 │   │   │   ├── Default: *Object (8 properties)
 │   │   │   │   ├── AdministratorLogin: *string
-│   │   │   │   ├── AdministratorLoginPassword: genruntime.SecretReference
+│   │   │   │   ├── AdministratorLoginPassword: *genruntime.SecretReference
 │   │   │   │   ├── CreateMode: *Enum (1 value)
 │   │   │   │   │   └── "Default"
 │   │   │   │   ├── MinimalTlsVersion: *Enum (4 values)
@@ -309,7 +309,7 @@ github.com/Azure/azure-service-operator/v2/api/dbformariadb/v1api20180601
 │   ├── Properties: *Object (4 properties)
 │   │   ├── Default: *Object (8 properties)
 │   │   │   ├── AdministratorLogin: *string
-│   │   │   ├── AdministratorLoginPassword: string
+│   │   │   ├── AdministratorLoginPassword: *string
 │   │   │   ├── CreateMode: Enum (1 value)
 │   │   │   │   └── "Default"
 │   │   │   ├── MinimalTlsVersion: *Enum (4 values)

diff --git a/v2/api/dbformariadb/v1api20180601/zz_generated.deepcopy.go b/v2/api/dbformariadb/v1api20180601/zz_generated.deepcopy.go
diff --git a/v2/api/devices/v1api20210702/iot_hub_spec_arm_types_gen.go b/v2/api/devices/v1api20210702/iot_hub_spec_arm_types_gen.go
diff --git a/v2/api/devices/v1api20210702/iot_hub_spec_arm_types_gen_test.go b/v2/api/devices/v1api20210702/iot_hub_spec_arm_types_gen_test.go
diff --git a/v2/api/devices/v1api20210702/iot_hub_types_gen.go b/v2/api/devices/v1api20210702/iot_hub_types_gen.go
diff --git a/v2/api/devices/v1api20210702/structure.txt b/v2/api/devices/v1api20210702/structure.txt
@@ -200,7 +200,7 @@ github.com/Azure/azure-service-operator/v2/api/devices/v1api20210702
 │   │   │       ├── AuthenticationType: *Enum (2 values)
 │   │   │       │   ├── "identityBased"
 │   │   │       │   └── "keyBased"
-│   │   │       ├── ConnectionString: genruntime.SecretReference
+│   │   │       ├── ConnectionString: *genruntime.SecretReference
 │   │   │       ├── ContainerName: *string
 │   │   │       ├── Identity: *Object (1 property)
 │   │   │       │   └── UserAssignedIdentity: *string
@@ -803,7 +803,7 @@ github.com/Azure/azure-service-operator/v2/api/devices/v1api20210702
     │       ├── AuthenticationType: *Enum (2 values)
     │       │   ├── "identityBased"
     │       │   └── "keyBased"
-    │       ├── ConnectionString: string
+    │       ├── ConnectionString: *string
     │       ├── ContainerName: *string
     │       ├── Identity: *Object (1 property)
     │       │   └── UserAssignedIdentity: *string

diff --git a/v2/api/devices/v1api20210702/zz_generated.deepcopy.go b/v2/api/devices/v1api20210702/zz_generated.deepcopy.go
diff --git a/v2/internal/controllers/crd_mariadb_server_test.go b/v2/internal/controllers/crd_mariadb_server_test.go
@@ -41,7 +41,7 @@ func Test_MariaDB_Server_CRUD(t *testing.T) {
 			Properties: &mariadb.ServerPropertiesForCreate{
 				Default: &mariadb.ServerPropertiesForDefaultCreate{
 					AdministratorLogin:         to.Ptr(adminUser),
-					AdministratorLoginPassword: adminPasswordRef,
+					AdministratorLoginPassword: &adminPasswordRef,
 					CreateMode:                 &createMode,
 					PublicNetworkAccess:        &networkAccess,
 					StorageProfile: &mariadb.StorageProfile{

diff --git a/v2/internal/reflecthelpers/reflect_helpers.go b/v2/internal/reflecthelpers/reflect_helpers.go
@@ -120,6 +120,11 @@ func FindSecretReferences(obj interface{}) (set.Set[genruntime.SecretReference],
 	return Find[genruntime.SecretReference](obj)
 }
 
+// FindSecretMaps finds all the genruntime.SecretMapReference's on the provided object
+func FindSecretMaps(obj interface{}) (set.Set[genruntime.SecretMapReference], error) {
+	return Find[genruntime.SecretMapReference](obj)
+}
+
 // FindConfigMapReferences finds all the genruntime.ConfigMapReference's on the provided object
 func FindConfigMapReferences(obj interface{}) (set.Set[genruntime.ConfigMapReference], error) {
 	return Find[genruntime.ConfigMapReference](obj)