From 1e1081bf7d59d4d23925d312e67b882f61e6e999 Mon Sep 17 00:00:00 2001 From: samitab Date: Wed, 24 Apr 2024 12:14:13 +1000 Subject: [PATCH 1/9] [ignore] Added Terraform CI for build and integration tests --- .github/workflows/checks.yml | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/checks.yml diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml new file mode 100644 index 000000000..abfba7ec2 --- /dev/null +++ b/.github/workflows/checks.yml @@ -0,0 +1,62 @@ +name: CI + +on: + push: + branches: [master] + pull_request: + +permissions: + # Permission for checking out code + contents: read + +jobs: + build: + name: Check & Build Provider + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - run: chmod +x ./scripts/gofmtcheck.sh + - name: gofmt Check + run: ./scripts/gofmtcheck.sh + # - name: Generate provider code + # run: go generate + # - name: Check generated code for diffs + # run: git diff --exit-code + - name: Build + run: go build -v + acceptance: + name: Acceptance Tests + needs: build + runs-on: ubuntu-latest + concurrency: + group: tf-aci-ci-test-${{ matrix.apic_host.name }} + cancel-in-progress: false + strategy: + fail-fast: false + matrix: + apic_host: + - name: v5.2 + url: 'https://173.36.219.83/' + - name: v6.0 + url: 'https://173.36.219.84/' + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - uses: hashicorp/setup-terraform@v2 + with: + terraform_version: '1.7.*' + terraform_wrapper: false + - name: Terraform Acceptance Test (APIC ${{ matrix.apic_host.name }}) + run: go test github.com/CiscoDevNet/terraform-provider-aci/v2/internal/provider -v -cover -timeout 120m + env: + TF_ACC: '1' + TF_ACC_STATE_LINEAGE: '1' + ACI_VAL_REL_DN: false + ACI_USERNAME: ${{ secrets.TF_ACC_ACI_USERNAME }} + ACI_PASSWORD: ${{ secrets.TF_ACC_ACI_PASSWORD }} + ACI_URL: ${{ matrix.apic_host.url }} \ No newline at end of file From 187731d7a6d8a21e16b0edad74569e56670ac969 Mon Sep 17 00:00:00 2001 From: samitab Date: Wed, 24 Apr 2024 15:08:19 +1000 Subject: [PATCH 2/9] [ignore] Added testing pipeline APIC hosts --- .github/workflows/checks.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index abfba7ec2..c02384f21 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -27,10 +27,14 @@ jobs: # run: git diff --exit-code - name: Build run: go build -v + acceptance: name: Acceptance Tests needs: build runs-on: ubuntu-latest + env: + ACI_USERNAME: 'ansible_github_ci' + ACI_PASSWORD: 'sJ94G92#8dq2hx*K4qh' concurrency: group: tf-aci-ci-test-${{ matrix.apic_host.name }} cancel-in-progress: false @@ -38,10 +42,16 @@ jobs: fail-fast: false matrix: apic_host: + - name: v4.2 + url: 'https://173.36.219.68/' - name: v5.2 - url: 'https://173.36.219.83/' + url: 'https://173.36.219.69/' - name: v6.0 - url: 'https://173.36.219.84/' + url: 'https://173.36.219.70/' + - name: aws_cloud + url: 'https://52.52.20.121/' + - name: azure_cloud + url: 'https://20.245.236.136/' steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 @@ -57,6 +67,4 @@ jobs: TF_ACC: '1' TF_ACC_STATE_LINEAGE: '1' ACI_VAL_REL_DN: false - ACI_USERNAME: ${{ secrets.TF_ACC_ACI_USERNAME }} - ACI_PASSWORD: ${{ secrets.TF_ACC_ACI_PASSWORD }} ACI_URL: ${{ matrix.apic_host.url }} \ No newline at end of file From 11ec9d43e6fe3a74955c5fba850f4990965351f3 Mon Sep 17 00:00:00 2001 From: samitab Date: Mon, 29 Apr 2024 06:45:51 +1000 Subject: [PATCH 3/9] [ignore] Generate codecov report --- .github/workflows/checks.yml | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c02384f21..0bcece87f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -21,16 +21,25 @@ jobs: - run: chmod +x ./scripts/gofmtcheck.sh - name: gofmt Check run: ./scripts/gofmtcheck.sh - # - name: Generate provider code - # run: go generate - # - name: Check generated code for diffs - # run: git diff --exit-code - name: Build run: go build -v + # diff: + # name: Check Generated Code Difference + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: actions/setup-go@v5 + # with: + # go-version-file: 'go.mod' + # - name: Generate provider code + # run: go generate + # - name: Check generated code for diffs + # run: git diff --exit-code + acceptance: name: Acceptance Tests - needs: build + needs: [build] runs-on: ubuntu-latest env: ACI_USERNAME: 'ansible_github_ci' @@ -48,10 +57,10 @@ jobs: url: 'https://173.36.219.69/' - name: v6.0 url: 'https://173.36.219.70/' - - name: aws_cloud - url: 'https://52.52.20.121/' - - name: azure_cloud - url: 'https://20.245.236.136/' + # - name: aws_cloud + # url: 'https://52.52.20.121/' + # - name: azure_cloud + # url: 'https://20.245.236.136/' steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 @@ -62,9 +71,13 @@ jobs: terraform_version: '1.7.*' terraform_wrapper: false - name: Terraform Acceptance Test (APIC ${{ matrix.apic_host.name }}) - run: go test github.com/CiscoDevNet/terraform-provider-aci/v2/internal/provider -v -cover -timeout 120m + run: go test github.com/CiscoDevNet/terraform-provider-aci/v2/internal/provider -v -timeout 300m -race -coverprofile=coverage.out -covermode=atomic env: TF_ACC: '1' TF_ACC_STATE_LINEAGE: '1' ACI_VAL_REL_DN: false - ACI_URL: ${{ matrix.apic_host.url }} \ No newline at end of file + ACI_URL: ${{ matrix.apic_host.url }} + - name: Upload coverage to Codecov + # Upload Coverage on latest only + if: ${{ matrix.apic_host.name == 'v6.0'}} + uses: codecov/codecov-action@v3 \ No newline at end of file From 258b90c7aa9cf6a7aeedf9e0fc53f78a2efa3f6a Mon Sep 17 00:00:00 2001 From: samitab Date: Mon, 29 Apr 2024 06:57:25 +1000 Subject: [PATCH 4/9] [ignore] Add check for missed vendor changes --- .github/workflows/checks.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 0bcece87f..53b19fe0f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -21,6 +21,10 @@ jobs: - run: chmod +x ./scripts/gofmtcheck.sh - name: gofmt Check run: ./scripts/gofmtcheck.sh + - run: go mod tidy + - run: go mod vendor + - name: Check vendor for changes + run: git diff --exit-code - name: Build run: go build -v From 92bdea6a32f937283541821c09870a87765ec86b Mon Sep 17 00:00:00 2001 From: samitab Date: Mon, 29 Apr 2024 09:17:45 +1000 Subject: [PATCH 5/9] [ignore] Remove race check for test --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 53b19fe0f..51bc92fc3 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -75,7 +75,7 @@ jobs: terraform_version: '1.7.*' terraform_wrapper: false - name: Terraform Acceptance Test (APIC ${{ matrix.apic_host.name }}) - run: go test github.com/CiscoDevNet/terraform-provider-aci/v2/internal/provider -v -timeout 300m -race -coverprofile=coverage.out -covermode=atomic + run: go test github.com/CiscoDevNet/terraform-provider-aci/v2/internal/provider -v -timeout 300m -coverprofile=coverage.out -covermode=atomic env: TF_ACC: '1' TF_ACC_STATE_LINEAGE: '1' From 6d652d05cea0d2a9fc1aee5723bb11b5fa933646 Mon Sep 17 00:00:00 2001 From: samitab Date: Mon, 29 Apr 2024 09:43:12 +1000 Subject: [PATCH 6/9] [ignore] Update terraform action version --- .github/workflows/checks.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 51bc92fc3..bafed17c4 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -55,8 +55,8 @@ jobs: fail-fast: false matrix: apic_host: - - name: v4.2 - url: 'https://173.36.219.68/' + # - name: v4.2 + # url: 'https://173.36.219.68/' - name: v5.2 url: 'https://173.36.219.69/' - name: v6.0 @@ -70,7 +70,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: 'go.mod' - - uses: hashicorp/setup-terraform@v2 + - uses: hashicorp/setup-terraform@v3 with: terraform_version: '1.7.*' terraform_wrapper: false From 40e545f86c4a5be2a3be233ebc371d44e7edc923 Mon Sep 17 00:00:00 2001 From: samitab Date: Mon, 29 Apr 2024 06:58:55 +1000 Subject: [PATCH 7/9] [ignore] Add missing booldefault module and fix rest managed data source. --- .../provider/data_source_aci_rest_managed.go | 14 ++++++- .../resource/schema/booldefault/doc.go | 5 +++ .../schema/booldefault/static_value.go | 42 +++++++++++++++++++ vendor/modules.txt | 1 + 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/doc.go create mode 100644 vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/static_value.go diff --git a/internal/provider/data_source_aci_rest_managed.go b/internal/provider/data_source_aci_rest_managed.go index 8ccf1ccea..32e32732e 100644 --- a/internal/provider/data_source_aci_rest_managed.go +++ b/internal/provider/data_source_aci_rest_managed.go @@ -27,6 +27,16 @@ type AciRestManagedDataSource struct { client *client.Client } +// AciRestManagedDataSourceModel describes the data source model. +type AciRestManagedDataSourceModel struct { + Id types.String `tfsdk:"id"` + Dn types.String `tfsdk:"dn"` + ClassName types.String `tfsdk:"class_name"` + Content types.Map `tfsdk:"content"` + Child types.Set `tfsdk:"child"` + Annotation types.String `tfsdk:"annotation"` +} + func (d *AciRestManagedDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) { tflog.Debug(ctx, "Start schema of datasource: aci_rest_managed") resp.TypeName = req.ProviderTypeName + "_rest_managed" @@ -110,7 +120,7 @@ func (d *AciRestManagedDataSource) Configure(ctx context.Context, req datasource func (d *AciRestManagedDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { tflog.Debug(ctx, "Start read of datasource: aci_rest_managed") - var data *AciRestManagedResourceModel + var data *AciRestManagedDataSourceModel // Read Terraform configuration data into the model resp.Diagnostics.Append(req.Config.Get(ctx, &data)...) @@ -202,7 +212,7 @@ func (d *AciRestManagedDataSource) Read(ctx context.Context, req datasource.Read } -func dataSourceRestManagedNotFoundError(diags *diag.Diagnostics, data *AciRestManagedResourceModel) { +func dataSourceRestManagedNotFoundError(diags *diag.Diagnostics, data *AciRestManagedDataSourceModel) { diags.AddError( "Failed to read aci_rest_managed data source", fmt.Sprintf("The aci_rest_managed data source with dn '%s' has not been found", data.Dn), diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/doc.go b/vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/doc.go new file mode 100644 index 000000000..fe6b0f76d --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/doc.go @@ -0,0 +1,5 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +// Package booldefault provides default values for types.Bool attributes. +package booldefault diff --git a/vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/static_value.go b/vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/static_value.go new file mode 100644 index 000000000..797f81d09 --- /dev/null +++ b/vendor/github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault/static_value.go @@ -0,0 +1,42 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package booldefault + +import ( + "context" + "fmt" + + "github.com/hashicorp/terraform-plugin-framework/resource/schema/defaults" + "github.com/hashicorp/terraform-plugin-framework/types" +) + +// StaticBool returns a static boolean value default handler. +// +// Use StaticBool if a static default value for a boolean should be set. +func StaticBool(defaultVal bool) defaults.Bool { + return staticBoolDefault{ + defaultVal: defaultVal, + } +} + +// staticBoolDefault is static value default handler that +// sets a value on a boolean attribute. +type staticBoolDefault struct { + defaultVal bool +} + +// Description returns a human-readable description of the default value handler. +func (d staticBoolDefault) Description(_ context.Context) string { + return fmt.Sprintf("value defaults to %t", d.defaultVal) +} + +// MarkdownDescription returns a markdown description of the default value handler. +func (d staticBoolDefault) MarkdownDescription(_ context.Context) string { + return fmt.Sprintf("value defaults to `%t`", d.defaultVal) +} + +// DefaultBool implements the static default value logic. +func (d staticBoolDefault) DefaultBool(_ context.Context, req defaults.BoolRequest, resp *defaults.BoolResponse) { + resp.PlanValue = types.BoolValue(d.defaultVal) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 84d288adc..616c39caa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -164,6 +164,7 @@ github.com/hashicorp/terraform-plugin-framework/provider/schema github.com/hashicorp/terraform-plugin-framework/providerserver github.com/hashicorp/terraform-plugin-framework/resource github.com/hashicorp/terraform-plugin-framework/resource/schema +github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault github.com/hashicorp/terraform-plugin-framework/resource/schema/defaults github.com/hashicorp/terraform-plugin-framework/resource/schema/mapplanmodifier github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier From bf6084649124eb5a94a2ac1380e0dad4446b2909 Mon Sep 17 00:00:00 2001 From: akinross Date: Sun, 28 Apr 2024 14:16:33 +0200 Subject: [PATCH 8/9] [minor_change] Add deprecation warning for relation_fv_rs_cust_qos_pol in aci_endpoint_security_group (ESG) resource --- aci/resource_aci_fvesg.go | 4 ++-- docs/resources/endpoint_security_group.md | 2 +- legacy-docs/docs/r/endpoint_security_group.html.markdown | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aci/resource_aci_fvesg.go b/aci/resource_aci_fvesg.go index 641746917..f23866116 100644 --- a/aci/resource_aci_fvesg.go +++ b/aci/resource_aci_fvesg.go @@ -116,10 +116,10 @@ func resourceAciEndpointSecurityGroup() *schema.Resource { }, }, "relation_fv_rs_cust_qos_pol": { - Type: schema.TypeString, - + Type: schema.TypeString, Optional: true, Description: "Create relation to qos:CustomPol", + Deprecated: "Remove `relation_fv_rs_cust_qos_pol` configuration as it is not used by ESG configuration. The attribute will be removed in the next major version of the provider.", }, "relation_fv_rs_intra_epg": { Type: schema.TypeSet, diff --git a/docs/resources/endpoint_security_group.md b/docs/resources/endpoint_security_group.md index d2a178f65..1c63b0ba9 100644 --- a/docs/resources/endpoint_security_group.md +++ b/docs/resources/endpoint_security_group.md @@ -84,7 +84,7 @@ resource "aci_endpoint_security_group" "example" { - `prio` - (Optional) The contract interface priority. Allowed values are "level1", "level2", "level3", "level4", "level5", "level6", "unspecified", and default value is "unspecified". Type: String. - `target_dn` - (Required) The distinguished name of the target contract. Type: String. -- `relation_fv_rs_cust_qos_pol` - (Optional) Represents the relation to a Custom QOS Policy (class qosCustomPol). It is a source relation to a custom QoS policy that enables different levels of service to be assigned to network traffic, including specifications for the Differentiated Services Code Point (DSCP) value(s) and the 802.1p Dot1p priority. Type: String. +- `relation_fv_rs_cust_qos_pol` - (Optional) **WARNING:** This attribute is deprecated and will be removed in the next major version. Represents the relation to a Custom QOS Policy (class qosCustomPol). It is a source relation to a custom QoS policy that enables different levels of service to be assigned to network traffic, including specifications for the Differentiated Services Code Point (DSCP) value(s) and the 802.1p Dot1p priority. Type: String. - `relation_fv_rs_intra_epg` - (Optional) Represents the relation to an Intra EPg Contract (class vzBrCP). Represents that the EPg is moving from "allow all within epg" mode to a "deny all within epg" mode. The only type of traffic allowed between EPs in this EPg is the one specified by contracts EPg associates to this relation. Type: List. diff --git a/legacy-docs/docs/r/endpoint_security_group.html.markdown b/legacy-docs/docs/r/endpoint_security_group.html.markdown index d2a178f65..1c63b0ba9 100644 --- a/legacy-docs/docs/r/endpoint_security_group.html.markdown +++ b/legacy-docs/docs/r/endpoint_security_group.html.markdown @@ -84,7 +84,7 @@ resource "aci_endpoint_security_group" "example" { - `prio` - (Optional) The contract interface priority. Allowed values are "level1", "level2", "level3", "level4", "level5", "level6", "unspecified", and default value is "unspecified". Type: String. - `target_dn` - (Required) The distinguished name of the target contract. Type: String. -- `relation_fv_rs_cust_qos_pol` - (Optional) Represents the relation to a Custom QOS Policy (class qosCustomPol). It is a source relation to a custom QoS policy that enables different levels of service to be assigned to network traffic, including specifications for the Differentiated Services Code Point (DSCP) value(s) and the 802.1p Dot1p priority. Type: String. +- `relation_fv_rs_cust_qos_pol` - (Optional) **WARNING:** This attribute is deprecated and will be removed in the next major version. Represents the relation to a Custom QOS Policy (class qosCustomPol). It is a source relation to a custom QoS policy that enables different levels of service to be assigned to network traffic, including specifications for the Differentiated Services Code Point (DSCP) value(s) and the 802.1p Dot1p priority. Type: String. - `relation_fv_rs_intra_epg` - (Optional) Represents the relation to an Intra EPg Contract (class vzBrCP). Represents that the EPg is moving from "allow all within epg" mode to a "deny all within epg" mode. The only type of traffic allowed between EPs in this EPg is the one specified by contracts EPg associates to this relation. Type: List. From 6344747b7f3b625ca339e7e5c959fa89c8313d16 Mon Sep 17 00:00:00 2001 From: akinross Date: Sun, 28 Apr 2024 14:17:23 +0200 Subject: [PATCH 9/9] [ignore] Add changes to rest docs to prevent reverting the changes made in escape html PR --- legacy-docs/docs/d/rest.html.markdown | 4 ++-- legacy-docs/docs/d/rest_managed.html.markdown | 4 ++-- legacy-docs/docs/r/rest.html.markdown | 2 +- legacy-docs/docs/r/rest_managed.html.markdown | 7 +++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/legacy-docs/docs/d/rest.html.markdown b/legacy-docs/docs/d/rest.html.markdown index 74ba64e21..7c90ac1d8 100644 --- a/legacy-docs/docs/d/rest.html.markdown +++ b/legacy-docs/docs/d/rest.html.markdown @@ -62,8 +62,8 @@ data "aci_rest" "tenant_rest_children" { - `id` - Dishtiguished name of object being managed. - `class_name` - Class name of object being managed. -- `content` - Map of key-value pairs which represents the attributes for the object being managed. +- `content` - A map of key-value pairs which represents the attributes for the object being managed. - `dn` - Distinguished name of object being managed. - `children` - Set of children of the object being managed. - `children.child_class_name` - Class name of the child of the object being managed. -- `children.child_content` - Map of key-value pairs which represents the attributes for child of the object being managed. +- `children.child_content` - A map of key-value pairs which represents the attributes for child of the object being managed. diff --git a/legacy-docs/docs/d/rest_managed.html.markdown b/legacy-docs/docs/d/rest_managed.html.markdown index 1f288ec0c..209ac8a38 100644 --- a/legacy-docs/docs/d/rest_managed.html.markdown +++ b/legacy-docs/docs/d/rest_managed.html.markdown @@ -33,9 +33,9 @@ data "aci_rest_managed" "example" { * `class_name` - (string) Which class object is being created. * `id` - (string) The Distinguished Name of the object. * `annotation` - (string) Annotation for the class object that is being created. When annotation is provided in content this will take precedence. -* `content` (map) Map of key-value pairs those needed to be passed to the Model object as parameters. Make sure the key name matches the name with the object parameter in ACI. +* `content` - (map) A map of key-value pairs those needed to be passed to the Model object as parameters. Make sure the key name matches the name with the object parameter in ACI. * `child` - (list) A list of child objects. * `rn` - (string) The Relative Name of the child object. * `class_name` - (string) Class name of child object. - * `content` (map) Map of key-value pairs which represents the attributes for the child object. + * `content` - (map) A map of key-value pairs which represents the attributes for the child object. diff --git a/legacy-docs/docs/r/rest.html.markdown b/legacy-docs/docs/r/rest.html.markdown index ec9ab72ff..b94d05e09 100644 --- a/legacy-docs/docs/r/rest.html.markdown +++ b/legacy-docs/docs/r/rest.html.markdown @@ -55,7 +55,7 @@ resource "aci_rest" "rest_yaml" { - `path` - (Required) ACI path where object should be created. Starting with api/node/mo/{parent-dn}(if applicable)/{rn of object}.json - `class_name` - (Optional) Which class object is being created. (Make sure there is no colon in the classname ) -- `content` - (Optional) Map of key-value pairs those needed to be passed to the Model object as parameters. Make sure the key name matches the name with the object parameter in ACI. +- `content` - (Optional) A map of key-value pairs those needed to be passed to the Model object as parameters. Make sure the key name matches the name with the object parameter in ACI. - `payload` - (Optional) Freestyle JSON or YAML payload which can directly be passed to the REST endpoint added in path. Either of content or payload is required. - `dn` - (Optional) Distinguished name of object being managed. diff --git a/legacy-docs/docs/r/rest_managed.html.markdown b/legacy-docs/docs/r/rest_managed.html.markdown index 050d549a0..539b9873d 100644 --- a/legacy-docs/docs/r/rest_managed.html.markdown +++ b/legacy-docs/docs/r/rest_managed.html.markdown @@ -81,10 +81,13 @@ resource "aci_rest_managed" "example_tenant_with_child" { * `annotation` - (string) Annotation for the class object that is being created. - Default: `orchestrator:terraform` -* `content` (map) Map of key-value pairs those needed to be passed to the Model object as parameters. Make sure the key name matches the name with the object parameter in ACI. +* `content` - (map) A map of key-value pairs those needed to be passed to the Model object as parameters. Make sure the key name matches the name with the object parameter in ACI. !> The annotation property is not allowed to be set in the content map of the resource. +* `escape_html` - (Boolean) Enable escaping of HTML characters when encoding the JSON payload. + - Default: `true` + * `child` - (list) A list of child objects. #### Required #### @@ -94,7 +97,7 @@ resource "aci_rest_managed" "example_tenant_with_child" { #### Optional ### - * `content` (map) Map of key-value pairs which represents the attributes for the child object. When annotation is provided in the content of the child it will take precedence over the annotation set at the parent level. + * `content` - (map) A map of key-value pairs which represents the attributes for the child object. When annotation is provided in the content of the child it will take precedence over the annotation set at the parent level. ## Importing ##