Skip to content
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

Add greengrass resource #5

Open
wants to merge 2 commits into
base: add_greengrass_resource
Choose a base branch
from
Open

Add greengrass resource #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa63751
Remove redundant resource_definition_version field
jmettes Jan 17, 2020
93fb515
Add Greengrass resource version acceptance tests
jmettes Jan 17, 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
100 changes: 43 additions & 57 deletions aws/resource_aws_greengrass_resource_definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,63 +152,54 @@ func resourceAwsGreengrassResourceDefinition() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"resource_definition_version": {
"resource": {
Type: schema.TypeSet,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"resource": {
Type: schema.TypeSet,
Optional: true,
"id": {
Type: schema.TypeString,
Required: true,
},
"name": {
Type: schema.TypeString,
Required: true,
},
"data_container": {
Type: schema.TypeList,
Required: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"id": {
Type: schema.TypeString,
Required: true,
"local_device_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateLocalDeviceResourceDataSchema(),
},
"name": {
Type: schema.TypeString,
Required: true,
"local_volume_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateLocalVolumeResourceDataSchema(),
},
"s3_machine_learning_model_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateS3MachineLearningModelResourceDataSchema(),
},
"data_container": {
"sagemaker_machine_learning_model_resource_data": {
Type: schema.TypeList,
Required: true,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"local_device_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateLocalDeviceResourceDataSchema(),
},
"local_volume_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateLocalVolumeResourceDataSchema(),
},
"s3_machine_learning_model_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateS3MachineLearningModelResourceDataSchema(),
},
"sagemaker_machine_learning_model_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateSageMakerMachineLearningModelResourceDataSchema(),
},
"secrets_manager_secret_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateSecretsManagerSecretResourceDataSchema(),
},
},
},
Elem: generateSageMakerMachineLearningModelResourceDataSchema(),
},
"secrets_manager_secret_resource_data": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: generateSecretsManagerSecretResourceDataSchema(),
},
},
},
Expand Down Expand Up @@ -331,11 +322,9 @@ func parseResourceDataContainer(rawData map[string]interface{}) *greengrass.Reso
}

func createResourceDefinitionVersion(d *schema.ResourceData, conn *greengrass.Greengrass) error {
var rawData map[string]interface{}
if v := d.Get("resource_definition_version").(*schema.Set).List(); len(v) == 0 {
var rawData []interface{}
if rawData = d.Get("resource").(*schema.Set).List(); len(rawData) == 0 {
return nil
} else {
rawData = v[0].(map[string]interface{})
}

params := &greengrass.CreateResourceDefinitionVersionInput{
Expand All @@ -347,7 +336,7 @@ func createResourceDefinitionVersion(d *schema.ResourceData, conn *greengrass.Gr
}

resources := make([]*greengrass.Resource, 0)
for _, resourceToCast := range rawData["resource"].(*schema.Set).List() {
for _, resourceToCast := range rawData {
rawResource := resourceToCast.(map[string]interface{})
resource := &greengrass.Resource{
Id: aws.String(rawResource["id"].(string)),
Expand Down Expand Up @@ -521,7 +510,6 @@ func setResourceDefinitionVersion(latestVersion string, d *schema.ResourceData,
return err
}

rawVersion := make(map[string]interface{})
d.Set("latest_definition_version_arn", *out.Arn)

rawResourceList := make([]map[string]interface{}, 0)
Expand All @@ -533,9 +521,7 @@ func setResourceDefinitionVersion(latestVersion string, d *schema.ResourceData,
rawResourceList = append(rawResourceList, rawResource)
}

rawVersion["resource"] = rawResourceList

d.Set("resource_definition_version", []map[string]interface{}{rawVersion})
d.Set("resource", rawResourceList)

return nil
}
Expand Down Expand Up @@ -592,7 +578,7 @@ func resourceAwsGreengrassResourceDefinitionUpdate(d *schema.ResourceData, meta
return err
}

if d.HasChange("resource_definition_version") {
if d.HasChange("resource") {
err = createResourceDefinitionVersion(d, conn)
if err != nil {
return err
Expand Down
Loading