Merge pull request #32 from arangodb-managed/OAS-3140

Author: forgems

README.md

@@ -77,6 +77,10 @@ resource "oasis_deployment" "my_oneshard_deployment" {
     node_size_id = "a4"
     node_disk_size = 20
   }
+
+  notification_settings {
+    email_addresses = "[email protected]" // this will set email addresses used for notifications regarding depoyment
+  }
 }
 
 // Example of oneshard deployment without node specification
@@ -124,6 +128,7 @@ resource "oasis_deployment" "my_sharded_deployment" {
     node_disk_size = 20
     node_count = 5
   }
+
 }
 ```
 

go.mod

@@ -1,7 +1,7 @@
 module github.com/arangodb-managed/terraform-provider-oasis
 
 require (
-	github.com/arangodb-managed/apis v0.70.8
+	github.com/arangodb-managed/apis v0.71.2
 	github.com/arangodb-managed/log-helper v0.2.0
 	github.com/gogo/protobuf v1.3.0
 	github.com/hashicorp/hcl v1.0.0 // indirect

go.sum

@@ -45,8 +45,8 @@ github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFU
 github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
 github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0=
 github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
-github.com/arangodb-managed/apis v0.70.8 h1:d6NqlgBdmt3l30kFc5NxyAJULD8wRtZGcrhcuqYFJiI=
-github.com/arangodb-managed/apis v0.70.8/go.mod h1:dSEV+DTPdZNH06qVqFWA+F0OcaL2ePGEo+odyMaU72Y=
+github.com/arangodb-managed/apis v0.71.2 h1:I5SAcZzAzzOJG5GvFwXBYG57btSx/YNEDo4IBW33ZJ4=
+github.com/arangodb-managed/apis v0.71.2/go.mod h1:dSEV+DTPdZNH06qVqFWA+F0OcaL2ePGEo+odyMaU72Y=
 github.com/arangodb-managed/log-helper v0.2.0 h1:QK85i0a+mGM++wK625Oe1z4HuXhvaN3vR/Nunwa1qAA=
 github.com/arangodb-managed/log-helper v0.2.0/go.mod h1:WJogNCCXWM5OQx/ZYvtRo/1zwm/IpKj+f4QVtM8hNJw=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=

pkg/resource_deployment.go

@@ -38,23 +38,25 @@ import (
 )
 
 const (
-	deplTAndCAcceptedFieldName                     = "terms_and_conditions_accepted"
-	deplProjectFieldName                           = "project"
-	deplNameFieldName                              = "name"
-	deplDescriptionFieldName                       = "description"
-	deplLocationFieldName                          = "location"
-	deplLocationRegionFieldName                    = "region"
-	deplVersionFieldName                           = "version"
-	deplVersionDbVersionFieldName                  = "db_version"
-	deplSecurityFieldName                          = "security"
-	deplSecurityCaCertificateFieldName             = "ca_certificate"
-	deplSecurityIpAllowlistFieldName               = "ip_allowlist"
-	deplSecurityDisableFoxxAuthenticationFieldName = "disable_foxx_authentication"
-	deplConfigurationFieldName                     = "configuration"
-	deplConfigurationModelFieldName                = "model"
-	deplConfigurationNodeSizeIdFieldName           = "node_size_id"
-	deplConfigurationNodeCountFieldName            = "node_count"
-	deplConfigurationNodeDiskSizeFieldName         = "node_disk_size"
+	deplTAndCAcceptedFieldName                           = "terms_and_conditions_accepted"
+	deplProjectFieldName                                 = "project"
+	deplNameFieldName                                    = "name"
+	deplDescriptionFieldName                             = "description"
+	deplLocationFieldName                                = "location"
+	deplLocationRegionFieldName                          = "region"
+	deplVersionFieldName                                 = "version"
+	deplVersionDbVersionFieldName                        = "db_version"
+	deplSecurityFieldName                                = "security"
+	deplSecurityCaCertificateFieldName                   = "ca_certificate"
+	deplSecurityIpAllowlistFieldName                     = "ip_allowlist"
+	deplSecurityDisableFoxxAuthenticationFieldName       = "disable_foxx_authentication"
+	deplConfigurationFieldName                           = "configuration"
+	deplConfigurationModelFieldName                      = "model"
+	deplConfigurationNodeSizeIdFieldName                 = "node_size_id"
+	deplConfigurationNodeCountFieldName                  = "node_count"
+	deplConfigurationNodeDiskSizeFieldName               = "node_disk_size"
+	deplNotificationConfigurationFieldName               = "notification_settings"
+	deplNotificationConfigurationEmailAddressesFieldName = "email_addresses"
 )
 
 func resourceDeployment() *schema.Resource {
@@ -180,6 +182,25 @@ func resourceDeployment() *schema.Resource {
 					},
 				},
 			},
+			deplNotificationConfigurationFieldName: {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					return new == ""
+				},
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						deplNotificationConfigurationEmailAddressesFieldName: {
+							Type:     schema.TypeList,
+							Optional: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+					},
+				},
+			},
 		},
 	}
 }
@@ -330,13 +351,14 @@ type configuration struct {
 func expandDeploymentResource(d *schema.ResourceData, defaultProject string) (*data.Deployment, error) {
 	project := defaultProject
 	var (
-		name        string
-		description string
-		ver         version
-		loc         location
-		conf        configuration
-		sec         securityFields
-		err         error
+		name                string
+		description         string
+		ver                 version
+		loc                 location
+		conf                configuration
+		sec                 securityFields
+		err                 error
+		notificationSetting *data.Deployment_NotificationSettings
 	)
 	if v, ok := d.GetOk(deplNameFieldName); ok {
 		name = v.(string)
@@ -372,6 +394,12 @@ func expandDeploymentResource(d *schema.ResourceData, defaultProject string) (*d
 		return nil, fmt.Errorf("unable to find parse field %s", deplConfigurationFieldName)
 	}
 
+	if v, ok := d.GetOk(deplNotificationConfigurationFieldName); ok {
+		if notificationSetting, err = expandNotificationSettings(v.([]interface{})); err != nil {
+			return nil, err
+		}
+	}
+
 	return &data.Deployment{
 		Name:                      name,
 		Description:               description,
@@ -387,6 +415,7 @@ func expandDeploymentResource(d *schema.ResourceData, defaultProject string) (*d
 			NodeDiskSize: int32(conf.nodeDiskSize),
 			NodeSizeId:   conf.nodeSizeId,
 		},
+		NotificationSettings: notificationSetting,
 	}, nil
 }
 
@@ -455,6 +484,26 @@ func expandConfiguration(s []interface{}) (conf configuration, err error) {
 	return
 }
 
+// expandNotificationSettings gathers notification settings data set in terraform schema
+func expandNotificationSettings(s []interface{}) (settings *data.Deployment_NotificationSettings, err error) {
+	for _, v := range s {
+		item := v.(map[string]interface{})
+		if emailAddresses, ok := item[deplNotificationConfigurationEmailAddressesFieldName]; ok {
+			emailAddresses, ok := emailAddresses.([]interface{})
+			if !ok {
+				return nil, fmt.Errorf("failed to parse field %s", deplNotificationConfigurationEmailAddressesFieldName)
+			}
+			if settings == nil {
+				settings = &data.Deployment_NotificationSettings{}
+			}
+			for _, addr := range emailAddresses {
+				settings.EmailAddresses = append(settings.EmailAddresses, addr.(string))
+			}
+		}
+	}
+	return
+}
+
 // resourceDeploymentRead retrieves deployment information from terraform stores.
 func resourceDeploymentRead(d *schema.ResourceData, m interface{}) error {
 	client := m.(*Client)
@@ -486,8 +535,9 @@ func flattenDeployment(depl *data.Deployment) map[string]interface{} {
 	loc := flattenLocationData(depl)
 	ver := flattenVersion(depl)
 	sec := flattenSecurity(depl)
+	notificationSetting := flattenNotificationSettings(depl)
 
-	return map[string]interface{}{
+	result := map[string]interface{}{
 		deplNameFieldName:          depl.GetName(),
 		deplProjectFieldName:       depl.GetProjectId(),
 		deplDescriptionFieldName:   depl.GetDescription(),
@@ -496,6 +546,10 @@ func flattenDeployment(depl *data.Deployment) map[string]interface{} {
 		deplVersionFieldName:       ver,
 		deplSecurityFieldName:      sec,
 	}
+	if notificationSetting != nil {
+		result[deplNotificationConfigurationFieldName] = notificationSetting
+	}
+	return result
 }
 
 // flattenVersion takes the version part of a deployment and creates a sub map for terraform schema.
@@ -539,6 +593,18 @@ func flattenConfigurationData(depl *data.Deployment) []interface{} {
 	}
 }
 
+// flattenNotificationSettings takes the notification settings part of a deployment and creates a sub map for terraform schema.
+func flattenNotificationSettings(depl *data.Deployment) []interface{} {
+	if depl.GetNotificationSettings() == nil {
+		return nil
+	}
+	return []interface{}{
+		map[string]interface{}{
+			deplNotificationConfigurationEmailAddressesFieldName: depl.GetNotificationSettings().GetEmailAddresses(),
+		},
+	}
+}
+
 // resourceDeploymentUpdate checks fields for differences and updates a deployment if necessary.
 func resourceDeploymentUpdate(d *schema.ResourceData, m interface{}) error {
 	client := m.(*Client)
@@ -597,6 +663,14 @@ func resourceDeploymentUpdate(d *schema.ResourceData, m interface{}) error {
 			depl.Model.NodeCount = int32(conf.nodeCount)
 		}
 	}
+	// if we have change on NotificationSettings apply it
+	if d.HasChange(deplNotificationConfigurationFieldName) {
+		settings, err := expandNotificationSettings(d.Get(deplNotificationConfigurationFieldName).([]interface{}))
+		if err != nil {
+			return err
+		}
+		depl.NotificationSettings = settings
+	}
 
 	if res, err := datac.UpdateDeployment(client.ctxWithToken, depl); err != nil {
 		client.log.Error().Err(err).Msg("Failed to update deployment")

pkg/resource_deployment_test.go

@@ -172,6 +172,67 @@ func TestFlattenDeploymentResourceDisableFoxxAuth(t *testing.T) {
 	assert.Equal(t, expected, flattened)
 }
 
+func TestFlattenDeploymentResourceNotificationSettings(t *testing.T) {
+	depl := &data.Deployment{
+		Name:        "test-name",
+		Description: "test-desc",
+		ProjectId:   "123456789",
+		RegionId:    "gcp-europe-west4",
+		Version:     "3.6.0",
+		Certificates: &data.Deployment_CertificateSpec{
+			CaCertificateId: "certificate-id",
+		},
+		IpallowlistId:             "ip-allowlist",
+		DisableFoxxAuthentication: true,
+		Model: &data.Deployment_ModelSpec{
+			Model:        "oneshard",
+			NodeSizeId:   "a8",
+			NodeCount:    3,
+			NodeDiskSize: 32,
+		},
+		NotificationSettings: &data.Deployment_NotificationSettings{
+			EmailAddresses: []string{"[email protected]"},
+		},
+	}
+	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.6.0",
+			},
+		},
+		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,
+			},
+		},
+		deplNotificationConfigurationFieldName: []interface{}{
+			map[string]interface{}{
+				deplNotificationConfigurationEmailAddressesFieldName: []string{"[email protected]"},
+			},
+		},
+	}
+	assert.Equal(t, expected, flattened)
+}
+
 func TestExpandingDeploymentResource(t *testing.T) {
 	depl := &data.Deployment{
 		Name:        "test-name",