Skip to content

Encryption At Rest: fixed issues and added an enhancement #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 18, 2020
Merged

Encryption At Rest: fixed issues and added an enhancement #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
059f41b
chore: removed forceNew attribute of Azure, added logic to updated az…
PacoDw Feb 10, 2020
74bcdc2
chore: added validation for Azure attributes in test cases
PacoDw Feb 10, 2020
7497b14
chore: improved test cases due to changes in the resource
PacoDw Feb 10, 2020
54db5ee
chore: added sensitive attribute to hide important information,issue #93
PacoDw Feb 10, 2020
76f4b44
chore: rename checkEncriptionAtRestEnvAzure to checkEncryptionAtRestE…
PacoDw Feb 12, 2020
2657347
chore: updated error comment in the delete function
PacoDw Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions mongodbatlas/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,25 @@ func checkPeeringEnvAzure(t *testing.T) {
}
}

func checkEncryptionAtRestEnvAzure(t *testing.T) {
if os.Getenv("AZURE_CLIENT_ID") == "" ||
os.Getenv("AZURE_CLIENT_ID_UPDATED") == "" ||
os.Getenv("AZURE_SUBCRIPTION_ID") == "" ||
os.Getenv("AZURE_RESOURSE_GROUP_NAME") == "" ||
os.Getenv("AZURE_RESOURSE_GROUP_NAME_UPDATED") == "" ||
os.Getenv("AZURE_SECRET") == "" ||
os.Getenv("AZURE_KEY_VAULT_NAME") == "" ||
os.Getenv("AZURE_KEY_VAULT_NAME_UPDATED") == "" ||
os.Getenv("AZURE_KEY_IDENTIFIER") == "" ||
os.Getenv("AZURE_KEY_IDENTIFIER_UPDATED") == "" ||
os.Getenv("AZURE_TENANT_ID") == "" {
t.Fatal(`'AZURE_CLIENT_ID','AZURE_CLIENT_ID_UPDATED', 'AZURE_SUBCRIPTION_ID',
'AZURE_RESOURSE_GROUP_NAME','AZURE_RESOURSE_GROUP_NAME_UPDATED', 'AZURE_SECRET',
'AZURE_SECRET_UPDATED', 'AZURE_KEY_VAULT_NAME', 'AZURE_KEY_IDENTIFIER', 'AZURE_KEY_VAULT_NAME_UPDATED',
'AZURE_KEY_IDENTIFIER_UPDATED', and 'AZURE_TENANT_ID' must be set for Encryption At Rest acceptance testing`)
}
}

func checkPeeringEnvGCP(t *testing.T) {
if os.Getenv("GCP_PROJECT_ID") == "" {
t.Fatal("`GCP_PROJECT_ID` must be set for network peering acceptance testing")
Expand Down
143 changes: 73 additions & 70 deletions mongodbatlas/resource_mongodbatlas_encryption_at_rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@ func resourceMongoDBAtlasEncryptionAtRest() *schema.Resource {
Required: true,
},
"access_key_id": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"secret_access_key": {
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"customer_master_key_id": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"region": {
Type: schema.TypeString,
Expand All @@ -55,54 +57,49 @@ func resourceMongoDBAtlasEncryptionAtRest() *schema.Resource {
},
"azure_key_vault": {
Type: schema.TypeMap,
ForceNew: true,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"enabled": {
Type: schema.TypeBool,
ForceNew: true,
Required: true,
},
"client_id": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"azure_environment": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
},
"subscription_id": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"resource_group_name": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
},
"key_vault_name": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
},
"key_identifier": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"secret": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"tenant_id": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
},
},
Expand All @@ -119,14 +116,16 @@ func resourceMongoDBAtlasEncryptionAtRest() *schema.Resource {
Required: true,
},
"service_account_key": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
Type: schema.TypeString,
ForceNew: true,
Required: true,
Sensitive: true,
},
"key_version_resource_id": {
Type: schema.TypeString,
ForceNew: true,
Required: true,
Type: schema.TypeString,
ForceNew: true,
Required: true,
Sensitive: true,
},
},
},
Expand All @@ -135,38 +134,17 @@ func resourceMongoDBAtlasEncryptionAtRest() *schema.Resource {
}
}

func expandAwsKms(awsKms map[string]interface{}) matlas.AwsKms {
awsRegion, _ := valRegion(awsKms["region"])
return matlas.AwsKms{
Enabled: pointy.Bool(cast.ToBool(awsKms["enabled"])),
AccessKeyID: awsKms["access_key_id"].(string),
SecretAccessKey: awsKms["secret_access_key"].(string),
CustomerMasterKeyID: awsKms["customer_master_key_id"].(string),
Region: awsRegion,
}
}

func resourceMongoDBAtlasEncryptionAtRestCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*matlas.Client)

encryptionAtRestReq := &matlas.EncryptionAtRest{
GroupID: d.Get("project_id").(string),
AwsKms: expandAwsKms(d.Get("aws_kms").(map[string]interface{})),
AzureKeyVault: matlas.AzureKeyVault{
Enabled: pointy.Bool(cast.ToBool(d.Get("azure_key_vault.enabled"))),
ClientID: d.Get("azure_key_vault.client_id").(string),
AzureEnvironment: d.Get("azure_key_vault.azure_environment").(string),
SubscriptionID: d.Get("azure_key_vault.subscription_id").(string),
ResourceGroupName: d.Get("azure_key_vault.resource_group_name").(string),
KeyVaultName: d.Get("azure_key_vault.key_vault_name").(string),
KeyIdentifier: d.Get("azure_key_vault.key_identifier").(string),
Secret: d.Get("azure_key_vault.secret").(string),
TenantID: d.Get("azure_key_vault.tenant_id").(string),
},
GroupID: d.Get("project_id").(string),
AwsKms: expandAwsKms(d.Get("aws_kms").(map[string]interface{})),
AzureKeyVault: expandAzureKeyVault(d.Get("azure_key_vault").(map[string]interface{})),
GoogleCloudKms: matlas.GoogleCloudKms{
Enabled: pointy.Bool(cast.ToBool(d.Get("google_cloud_kms.enabled"))),
ServiceAccountKey: d.Get("google_cloud_kms.service_account_key").(string),
KeyVersionResourceID: d.Get("google_cloud_kms.key_version_resource_id").(string),
ServiceAccountKey: cast.ToString(d.Get("google_cloud_kms.service_account_key")),
KeyVersionResourceID: cast.ToString(d.Get("google_cloud_kms.key_version_resource_id")),
},
}

Expand All @@ -190,37 +168,62 @@ func resourceMongoDBAtlasEncryptionAtRestRead(d *schema.ResourceData, meta inter
return nil
}

func resourceMongoDBAtlasEncryptionAtRestDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*matlas.Client)

_, err := conn.EncryptionsAtRest.Delete(context.Background(), d.Id())
if err != nil {
return fmt.Errorf("error deleting a encryptionAtRest (%s): %s", d.Id(), err)
}
return nil
}

func resourceMongoDBAtlasEncryptionAtRestUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*matlas.Client)
projectID := d.Id()

encrypt, _, err := conn.EncryptionsAtRest.Get(context.Background(), projectID)

if err != nil {
return fmt.Errorf("error getting encryption at rest information: %s", err)
}
encrypt.GroupID = projectID

if d.HasChange("aws_kms") {
encrypt.AwsKms = expandAwsKms(d.Get("aws_kms").(map[string]interface{}))
}

encrypt.GroupID = projectID
if d.HasChange("azure_key_vault") {
encrypt.AzureKeyVault = expandAzureKeyVault(d.Get("azure_key_vault").(map[string]interface{}))
}

_, _, err = conn.EncryptionsAtRest.Create(context.Background(), encrypt)

if err != nil {
return fmt.Errorf("error updating encryption at rest (%s): %s", projectID, err)
}

return resourceMongoDBAtlasEncryptionAtRestRead(d, meta)
}

func resourceMongoDBAtlasEncryptionAtRestDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*matlas.Client)

_, err := conn.EncryptionsAtRest.Delete(context.Background(), d.Id())
if err != nil {
return fmt.Errorf("error removing encryption at rest (%s): %s", d.Id(), err)
}
return nil
}

func expandAwsKms(awsKms map[string]interface{}) matlas.AwsKms {
awsRegion, _ := valRegion(awsKms["region"])
return matlas.AwsKms{
Enabled: pointy.Bool(cast.ToBool(awsKms["enabled"])),
AccessKeyID: cast.ToString(awsKms["access_key_id"]),
SecretAccessKey: cast.ToString(awsKms["secret_access_key"]),
CustomerMasterKeyID: cast.ToString(awsKms["customer_master_key_id"]),
Region: awsRegion,
}
}

func expandAzureKeyVault(azure map[string]interface{}) matlas.AzureKeyVault {
return matlas.AzureKeyVault{
Enabled: pointy.Bool(cast.ToBool(azure["enabled"])),
ClientID: cast.ToString(azure["client_id"]),
AzureEnvironment: cast.ToString(azure["azure_environment"]),
SubscriptionID: cast.ToString(azure["subscription_id"]),
ResourceGroupName: cast.ToString(azure["resource_group_name"]),
KeyVaultName: cast.ToString(azure["key_vault_name"]),
KeyIdentifier: cast.ToString(azure["key_identifier"]),
Secret: cast.ToString(azure["secret"]),
TenantID: cast.ToString(azure["tenant_id"]),
}
}
Loading