Merge pull request #82 from arangodb-managed/OAS-7161

OAS-7161 | add flag to enable / disable platform auth

Author: Robert-Stam

go.mod

@@ -1,7 +1,7 @@
 module github.com/arangodb-managed/terraform-provider-oasis
 
 require (
-	github.com/arangodb-managed/apis v0.79.15
+	github.com/arangodb-managed/apis v0.79.17
 	github.com/arangodb-managed/log-helper v0.2.5
 	github.com/gogo/protobuf v1.3.2
 	github.com/hashicorp/terraform-plugin-docs v0.8.1

go.sum

@@ -31,8 +31,8 @@ github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
-github.com/arangodb-managed/apis v0.79.15 h1:d7/VE3+zm0HshaV9Dx16XTpyNKfggwQxu70WoVJbOyk=
-github.com/arangodb-managed/apis v0.79.15/go.mod h1:ZlvA803MmUI3m6ijvaAYKKaWgLJq8bBZZuq8uyZo2PY=
+github.com/arangodb-managed/apis v0.79.17 h1:U8prEbReMiuG7h+4KY8V0tpkJBotN/Np3ptO9iQz9fU=
+github.com/arangodb-managed/apis v0.79.17/go.mod h1:ZlvA803MmUI3m6ijvaAYKKaWgLJq8bBZZuq8uyZo2PY=
 github.com/arangodb-managed/log-helper v0.2.5 h1:Kg3+0bDVFhEgyjMhIbCIj9hejgN2VaD4Cw/JQ4ARsd4=
 github.com/arangodb-managed/log-helper v0.2.5/go.mod h1:G17ASSd3Edday3i1QREGefyLJ2TduHxxFsOaqoigurE=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=

internal/resource_deployment.go

@@ -60,6 +60,7 @@ const (
 	deplDisableScheduledRootPasswordRotationFieldName    = "disable_scheduled_root_password_rotation"
 	deplLockedFieldName                                  = "locked"
 	deplDeploymentProfileIDFieldName                     = "deployment_profile_id"
+	deplIsPlatformAuthEnabled                            = "is_platform_authentication_enabled"
 )
 
 func resourceDeployment() *schema.Resource {
@@ -257,6 +258,13 @@ func resourceDeployment() *schema.Resource {
 				Description: "Deployment Resource Deployment Profile ID field",
 				Optional:    true,
 			},
+
+			deplIsPlatformAuthEnabled: {
+				Type:        schema.TypeBool,
+				Description: "Deployment Resource Deployment Is Platform Authentication Enabled field",
+				Optional:    true,
+				Default:     false,
+			},
 		},
 	}
 }
@@ -431,6 +439,7 @@ func expandDeploymentResource(d *schema.ResourceData, defaultProject string) (*d
 		scheduledRootPasswordRotationDisabled bool
 		locked                                bool
 		deploymentProfileID                   string
+		isPlatformAuthenticationEnabled       bool
 	)
 	if v, ok := d.GetOk(deplNameFieldName); ok {
 		name = v.(string)
@@ -492,6 +501,10 @@ func expandDeploymentResource(d *schema.ResourceData, defaultProject string) (*d
 		deploymentProfileID = v.(string)
 	}
 
+	if v, ok := d.GetOk(deplIsPlatformAuthEnabled); ok {
+		isPlatformAuthenticationEnabled = v.(bool)
+	}
+
 	return &data.Deployment{
 		Name:                      name,
 		Description:               description,
@@ -513,6 +526,7 @@ func expandDeploymentResource(d *schema.ResourceData, defaultProject string) (*d
 		IsScheduledRootPasswordRotationEnabled: !scheduledRootPasswordRotationDisabled,
 		Locked:                                 locked,
 		DeploymentProfileId:                    deploymentProfileID,
+		IsPlatformAuthenticationEnabled:        isPlatformAuthenticationEnabled,
 	}, nil
 }
 
@@ -648,6 +662,7 @@ func flattenDeployment(depl *data.Deployment) map[string]interface{} {
 		deplDiskPerformanceFieldName:                      depl.GetDiskPerformanceId(),
 		deplDisableScheduledRootPasswordRotationFieldName: !depl.GetIsScheduledRootPasswordRotationEnabled(),
 		deplLockedFieldName:                               depl.GetLocked(),
+		deplIsPlatformAuthEnabled:                         depl.GetIsPlatformAuthenticationEnabled(),
 	}
 	if notificationSetting != nil {
 		result[deplNotificationConfigurationFieldName] = notificationSetting

internal/resource_deployment_test.go

@@ -129,6 +129,68 @@ func TestFlattenDeploymentResource(t *testing.T) {
 		deplDisableScheduledRootPasswordRotationFieldName: true,
 		deplLockedFieldName:                               false,
 		deplDeploymentProfileIDFieldName:                  deploymentProfileTestID,
+		deplIsPlatformAuthEnabled:                         false,
+	}
+	assert.Equal(t, expected, flattened)
+}
+
+// TestFlattenDeploymentResourcePlatformAuthentication tests the Oasis Deployment flattening with PlatformAuthentication set to true.
+func TestFlattenDeploymentResourcePlatformAuthentication(t *testing.T) {
+	depl := &data.Deployment{
+		Name:        "test-name",
+		Description: "test-desc",
+		ProjectId:   "123456789",
+		RegionId:    "gcp-europe-west4",
+		Version:     "3.9.1",
+		Certificates: &data.Deployment_CertificateSpec{
+			CaCertificateId: "certificate-id",
+		},
+		IpallowlistId:             "ip-allowlist",
+		DisableFoxxAuthentication: true,
+		Model: &data.Deployment_ModelSpec{
+			Model:        "oneshard",
+			NodeSizeId:   "a8",
+			NodeCount:    3,
+			NodeDiskSize: 32,
+		},
+		IsScheduledRootPasswordRotationEnabled: true,
+		Locked:                                 true,
+		IsPlatformAuthenticationEnabled:        true,
+	}
+	flattened := flattenDeployment(depl)
+	expected := map[string]interface{}{
+		deplProjectFieldName:     "123456789",
+		deplNameFieldName:        "test-name",
+		deplDescriptionFieldName: "test-desc",
+		deplLocationFieldName: []interface{}{
+			map[string]interface{}{
+				deplLocationRegionFieldName: "gcp-europe-west4",
+			},
+		},
+		deplVersionFieldName: []interface{}{
+			map[string]interface{}{
+				deplVersionDbVersionFieldName: "3.9.1",
+			},
+		},
+		deplSecurityFieldName: []interface{}{
+			map[string]interface{}{
+				deplSecurityCaCertificateFieldName:             "certificate-id",
+				deplSecurityIpAllowlistFieldName:               "ip-allowlist",
+				deplSecurityDisableFoxxAuthenticationFieldName: true,
+			},
+		},
+		deplConfigurationFieldName: []interface{}{
+			map[string]interface{}{
+				deplConfigurationModelFieldName:        "oneshard",
+				deplConfigurationNodeSizeIdFieldName:   "a8",
+				deplConfigurationNodeCountFieldName:    3,
+				deplConfigurationNodeDiskSizeFieldName: 32,
+			},
+		},
+		deplDiskPerformanceFieldName:                      "", // Not set
+		deplDisableScheduledRootPasswordRotationFieldName: false,
+		deplLockedFieldName:                               true,
+		deplIsPlatformAuthEnabled:                         true,
 	}
 	assert.Equal(t, expected, flattened)
 }
@@ -188,6 +250,7 @@ func TestFlattenDeploymentResourceDisableFoxxAuth(t *testing.T) {
 		deplDiskPerformanceFieldName:                      "", // Not set
 		deplDisableScheduledRootPasswordRotationFieldName: false,
 		deplLockedFieldName:                               true,
+		deplIsPlatformAuthEnabled:                         false,
 	}
 	assert.Equal(t, expected, flattened)
 }
@@ -255,6 +318,7 @@ func TestFlattenDeploymentResourceNotificationSettings(t *testing.T) {
 		deplDiskPerformanceFieldName:                      "",
 		deplDisableScheduledRootPasswordRotationFieldName: true,
 		deplLockedFieldName:                               true,
+		deplIsPlatformAuthEnabled:                         false,
 	}
 	assert.Equal(t, expected, flattened)
 }
@@ -381,7 +445,8 @@ func TestExpandingDeploymentResourceDisableFoxxAuth(t *testing.T) {
 			},
 		},
 		deplDisableScheduledRootPasswordRotationFieldName: false,
-		deplLockedFieldName: true,
+		deplLockedFieldName:       true,
+		deplIsPlatformAuthEnabled: false,
 	}
 	s := resourceDeployment().Schema
 	resourceData := schema.TestResourceDataRaw(t, s, raw)
@@ -440,7 +505,8 @@ func TestExpandDeploymentOverrideProjectID(t *testing.T) {
 			},
 		},
 		deplDisableScheduledRootPasswordRotationFieldName: true,
-		deplLockedFieldName: true,
+		deplLockedFieldName:       true,
+		deplIsPlatformAuthEnabled: false,
 	}
 	s := resourceDeployment().Schema
 	resourceData := schema.TestResourceDataRaw(t, s, raw)