Remove QuickSpace related TODOs (#2574)

This reinstates 2 resources that were skipped to avoid C# SDK compilation issues, removing the TODOs.
pulumi · Jun 23, 2023 · 49e1f04 · 49e1f04
1 parent 3750271
commit 49e1f04
Show file tree

Hide file tree

Showing 52 changed files with 9,642 additions and 3,104 deletions.
diff --git a/provider/cmd/pulumi-resource-aws/bridge-metadata.json b/provider/cmd/pulumi-resource-aws/bridge-metadata.json
@@ -334,6 +334,7 @@
             "aws:directoryservice/serviceRegion:ServiceRegion": 0,
             "aws:directoryservice/sharedDirectory:SharedDirectory": 0,
             "aws:directoryservice/sharedDirectoryAccepter:SharedDirectoryAccepter": 0,
+            "aws:directoryservice/trust:Trust": 1,
             "aws:dlm/lifecyclePolicy:LifecyclePolicy": 0,
             "aws:dms/certificate:Certificate": 0,
             "aws:dms/endpoint:Endpoint": 0,
@@ -887,6 +888,7 @@
             "aws:quicksight/groupMembership:GroupMembership": 0,
             "aws:quicksight/iamPolicyAssignment:IamPolicyAssignment": 1,
             "aws:quicksight/ingestion:Ingestion": 1,
+            "aws:quicksight/namespace:Namespace": 1,
             "aws:quicksight/refreshSchedule:RefreshSchedule": 1,
             "aws:quicksight/template:Template": 0,
             "aws:quicksight/templateAlias:TemplateAlias": 1,
@@ -2083,6 +2085,7 @@
             "aws:directoryservice/serviceRegion:ServiceRegion": "aws_directory_service_region",
             "aws:directoryservice/sharedDirectory:SharedDirectory": "aws_directory_service_shared_directory",
             "aws:directoryservice/sharedDirectoryAccepter:SharedDirectoryAccepter": "aws_directory_service_shared_directory_accepter",
+            "aws:directoryservice/trust:Trust": "aws_directory_service_trust",
             "aws:dlm/lifecyclePolicy:LifecyclePolicy": "aws_dlm_lifecycle_policy",
             "aws:dms/certificate:Certificate": "aws_dms_certificate",
             "aws:dms/endpoint:Endpoint": "aws_dms_endpoint",
@@ -2636,6 +2639,7 @@
             "aws:quicksight/groupMembership:GroupMembership": "aws_quicksight_group_membership",
             "aws:quicksight/iamPolicyAssignment:IamPolicyAssignment": "aws_quicksight_iam_policy_assignment",
             "aws:quicksight/ingestion:Ingestion": "aws_quicksight_ingestion",
+            "aws:quicksight/namespace:Namespace": "aws_quicksight_namespace",
             "aws:quicksight/refreshSchedule:RefreshSchedule": "aws_quicksight_refresh_schedule",
             "aws:quicksight/template:Template": "aws_quicksight_template",
             "aws:quicksight/templateAlias:TemplateAlias": "aws_quicksight_template_alias",
@@ -11096,6 +11100,21 @@
                 "ownerDirectoryId": "owner_directory_id",
                 "sharedDirectoryId": "shared_directory_id"
             },
+            "aws:directoryservice/trust:Trust": {
+                "conditionalForwarderIpAddrs": "conditional_forwarder_ip_addrs",
+                "createdDateTime": "created_date_time",
+                "deleteAssociatedConditionalForwarder": "delete_associated_conditional_forwarder",
+                "directoryId": "directory_id",
+                "lastUpdatedDateTime": "last_updated_date_time",
+                "remoteDomainName": "remote_domain_name",
+                "selectiveAuth": "selective_auth",
+                "stateLastUpdatedDateTime": "state_last_updated_date_time",
+                "trustDirection": "trust_direction",
+                "trustPassword": "trust_password",
+                "trustState": "trust_state",
+                "trustStateReason": "trust_state_reason",
+                "trustType": "trust_type"
+            },
             "aws:dlm/LifecyclePolicyPolicyDetails:LifecyclePolicyPolicyDetails": {
                 "eventSource": "event_source",
                 "policyType": "policy_type",
@@ -114433,6 +114452,13 @@
                 "ingestionStatus": "ingestion_status",
                 "ingestionType": "ingestion_type"
             },
+            "aws:quicksight/namespace:Namespace": {
+                "awsAccountId": "aws_account_id",
+                "capacityRegion": "capacity_region",
+                "creationStatus": "creation_status",
+                "identityStore": "identity_store",
+                "tagsAll": "tags_all"
+            },
             "aws:quicksight/refreshSchedule:RefreshSchedule": {
                 "awsAccountId": "aws_account_id",
                 "dataSetId": "data_set_id",

diff --git a/provider/cmd/pulumi-resource-aws/schema.json b/provider/cmd/pulumi-resource-aws/schema.json
diff --git a/provider/resources.go b/provider/resources.go
@@ -1521,6 +1521,17 @@ func Provider() *tfbridge.ProviderInfo {
 			"aws_directory_service_radius_settings":           {Tok: awsResource(directoryserviceMod, "RadiusSettings")},
 			"aws_directory_service_region":                    {Tok: awsResource(directoryserviceMod, "ServiceRegion")},
 
+			"aws_directory_service_trust": {
+				Tok: awsResource(directoryserviceMod, "Trust"),
+				Fields: map[string]*tfbridge.SchemaInfo{
+					"trust_state": {
+						// Without this rename, C# compilation fails as there is a TrustState
+						// class generated in the SDK that now conflicts with TrustState field.
+						CSharpName: "Truststate",
+					},
+				},
+			},
+
 			// Document DB
 			"aws_docdb_cluster":                 {Tok: awsResource(docdbMod, "Cluster")},
 			"aws_docdb_cluster_instance":        {Tok: awsResource(docdbMod, "ClusterInstance")},
@@ -7074,9 +7085,15 @@ func Provider() *tfbridge.ProviderInfo {
 		"aws_quicksight_ingestion": {
 			Tok: awsResource("QuickSight", "Ingestion"),
 		},
-		// "aws_quicksight_namespace": {
-		// 	Tok: awsResource("QuickSight", "Namespace"),
-		// },
+		"aws_quicksight_namespace": {
+			Tok: awsResource("QuickSight", "Namespace"),
+			Fields: map[string]*tfbridge.SchemaInfo{
+				"namespace": {
+					// Avoid conflict with "Namespace" class name that breaks compilation.
+					CSharpName: "NameSpace",
+				},
+			},
+		},
 		"aws_quicksight_folder_membership": {
 			Tok: awsResource("QuickSight", "FolderMembership"),
 		},
@@ -7092,15 +7109,6 @@ func Provider() *tfbridge.ProviderInfo {
 		prov.Resources[k] = v
 	}
 
-	// TODO fix C# compilation error for QuickSight Namespace
-	// error CS0542: 'Namespace': member names cannot be the same as their enclosing type
-	// 9 Warning(s)
-	// 1 Error(s)
-	prov.IgnoreMappings = append(prov.IgnoreMappings, "aws_quicksight_namespace")
-	// TODO fix C# compilation error for DirectoryService Trust
-	// error CS0542: 'TrustState': member names cannot be the same as their enclosing type
-	prov.IgnoreMappings = append(prov.IgnoreMappings, "aws_directory_service_trust")
-
 	if err := x.ComputeDefaults(&prov, x.TokensMappedModules("aws_", "", moduleMap,
 		func(mod, name string) (string, error) {
 			return awsResource(mod, name).String(), nil