From b42ee2a4a0ac2fdba5022075fbce245d4cb7e8da Mon Sep 17 00:00:00 2001 From: Evan Verney-Fink <9777656+evanverneyfink@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:15:21 -0400 Subject: [PATCH] v0.0.23: Revert provider model to use 'custom_properties' --- docs/resources/job_profile.md | 4 ++-- examples/resources/mcma_job_profile/resource.tf | 2 +- mcma/resource_job_profile.go | 6 +++--- mcma/resource_job_profile_test.go | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/resources/job_profile.md b/docs/resources/job_profile.md index f2bc12a..d0e10b4 100644 --- a/docs/resources/job_profile.md +++ b/docs/resources/job_profile.md @@ -35,7 +35,7 @@ resource "mcma_job_profile" "example" { type = "number" } - custom = { + custom_properties = { customprop1 = "customprop1val" customprop2 = "customprop2val" } @@ -51,7 +51,7 @@ resource "mcma_job_profile" "example" { ### Optional -- `custom` (Map of String) A collection of key-value pairs specifying additional properties for the job profile. +- `custom_properties` (Map of String) A collection of key-value pairs specifying additional properties for the job profile. - `input_parameter` (Block Set) A list of input parameters (name and type) that must be provided when running a job for this profile. (see [below for nested schema](#nestedblock--input_parameter)) - `output_parameter` (Block Set) A list of output parameters (name and type) that will be set on the job when the service has finished. (see [below for nested schema](#nestedblock--output_parameter)) diff --git a/examples/resources/mcma_job_profile/resource.tf b/examples/resources/mcma_job_profile/resource.tf index 0ab430a..85b21a2 100644 --- a/examples/resources/mcma_job_profile/resource.tf +++ b/examples/resources/mcma_job_profile/resource.tf @@ -20,7 +20,7 @@ resource "mcma_job_profile" "example" { type = "number" } - custom = { + custom_properties = { customprop1 = "customprop1val" customprop2 = "customprop2val" } diff --git a/mcma/resource_job_profile.go b/mcma/resource_job_profile.go index b1e21c5..d296e2f 100644 --- a/mcma/resource_job_profile.go +++ b/mcma/resource_job_profile.go @@ -91,7 +91,7 @@ func resourceJobProfile() *schema.Resource { }, }, }, - "custom": { + "custom_properties": { Type: schema.TypeMap, Description: "A collection of key-value pairs specifying additional properties for the job profile.", Optional: true, @@ -134,7 +134,7 @@ func getJobProfileFromResourceData(d *schema.ResourceData) mcmamodel.JobProfile InputParameters: inputParameters, OutputParameters: outputParameters, OptionalInputParameters: optionalInputParameters, - Custom: d.Get("custom").(map[string]interface{}), + Custom: d.Get("custom_properties").(map[string]interface{}), } } @@ -161,7 +161,7 @@ func resourceJobProfileRead(_ context.Context, d *schema.ResourceData, m interfa _ = d.Set("date_created", jobProfile.DateCreated.Format(time.RFC3339)) _ = d.Set("date_modified", jobProfile.DateModified.Format(time.RFC3339)) _ = d.Set("name", jobProfile.Name) - _ = d.Set("custom", jobProfile.Custom) + _ = d.Set("custom_properties", jobProfile.Custom) var inputParameters []map[string]interface{} for _, inputParameter := range jobProfile.InputParameters { diff --git a/mcma/resource_job_profile_test.go b/mcma/resource_job_profile_test.go index 5df5e4f..4ba6175 100644 --- a/mcma/resource_job_profile_test.go +++ b/mcma/resource_job_profile_test.go @@ -91,7 +91,7 @@ resource "mcma_job_profile" "job_profile_%s" { name = "outparam2" type = "number" } - custom = { + custom_properties = { customprop1 = "customprop1val" customprop2 = "customprop2val" } @@ -122,7 +122,7 @@ resource "mcma_job_profile" "job_profile_%s_1" { name = "outparam2" type = "number" } - custom = { + custom_properties = { customprop1 = "customprop1val" customprop2 = "customprop2val" } @@ -147,7 +147,7 @@ resource "mcma_job_profile" "job_profile_%s_2" { name = "outparam4" type = "number" } - custom = { + custom_properties = { customprop1 = "customprop3val" customprop2 = "customprop4val" } @@ -172,7 +172,7 @@ resource "mcma_job_profile" "job_profile_%s_3" { name = "outparam6" type = "number" } - custom = { + custom_properties = { customprop1 = "customprop5val" customprop2 = "customprop6val" }