Merge branch 'master' of https://github.com/CiscoDevNet/terraform-pro…

…vider-aci

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,

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.
 

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"
@@ -114,7 +124,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)...)
@@ -206,7 +216,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),

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.

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.

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.
 

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.
 

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 ##