[ignore] Fix resourceName set to singular when max class allowed set …

…to one. Modify Logic for generating Rs class set to one max class allowed.

docs/data-sources/access_interface_override.md

@@ -59,7 +59,7 @@ data "aci_access_interface_override" "example" {
 * `owner_key` (ownerKey) - (string) The key for enabling clients to own their data for entity correlation.
 * `owner_tag` (ownerTag) - (string) A tag for enabling clients to add their own data. For example, to indicate who created this object.
 
-* `relation_to_host_paths` - (list) A list of Relation To Host Paths (ACI object [infraRsHPathAtt](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/infraRsHPathAtt/overview)) pointing to  (ACI Object [fabricPathEp](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fabricPathEp/overview)).
+* `relation_to_host_path` - (list) A list of Relation To Host Path (ACI object [infraRsHPathAtt](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/infraRsHPathAtt/overview)) pointing to  (ACI Object [fabricPathEp](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fabricPathEp/overview)).
   * `annotation` (annotation) - (string) The annotation of the Relation To Host Path object.
   * `target_dn` (tDn) - (string) The distinguished name of the target.
 

docs/resources/access_interface_override.md

@@ -54,7 +54,7 @@ resource "aci_access_interface_override" "full_example" {
   name_alias  = "name_alias_1"
   owner_key   = "owner_key_1"
   owner_tag   = "owner_tag_1"
-  relation_to_host_paths = [
+  relation_to_host_path = [
     {
       annotation = "annotation_1"
       target_dn  = "topology/pod-1/paths-101/pathep-[eth1/1]"
@@ -108,7 +108,7 @@ All examples for the Access Interface Override resource can be found in the [exa
 * `owner_key` (ownerKey) - (string) The key for enabling clients to own their data for entity correlation.
 * `owner_tag` (ownerTag) - (string) A tag for enabling clients to add their own data. For example, to indicate who created this object.
 
-* `relation_to_host_paths` - (list) A list of Relation To Host Paths (ACI object [infraRsHPathAtt](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/infraRsHPathAtt/overview)) pointing to  (ACI Object [fabricPathEp](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fabricPathEp/overview)).
+* `relation_to_host_path` - (list) A list of Relation To Host Path (ACI object [infraRsHPathAtt](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/infraRsHPathAtt/overview)) pointing to  (ACI Object [fabricPathEp](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fabricPathEp/overview)).
     - Max Items: 1
 
   #### Required ####

examples/resources/aci_access_interface_override/resource-all-attributes.tf

@@ -6,7 +6,7 @@ resource "aci_access_interface_override" "full_example" {
   name_alias  = "name_alias_1"
   owner_key   = "owner_key_1"
   owner_tag   = "owner_tag_1"
-  relation_to_host_paths = [
+  relation_to_host_path = [
     {
       annotation = "annotation_1"
       target_dn  = "topology/pod-1/paths-101/pathep-[eth1/1]"

gen/generator.go

@@ -712,9 +712,9 @@ func main() {
 	for _, model := range classModels {
 
 		// Only render resources and datasources when the class has a unique identifier or is marked as include in the classes definitions YAML file
-		// And only render when the class is also not a Rs object and is not set to max one class allowed
-		// TODO might need to extend this last condition in the future
-		if (len(model.IdentifiedBy) > 0 || model.Include) && !(strings.HasPrefix(model.RnFormat, "rs") && model.MaxOneClassAllowed) {
+		// And if the class has a unique identifier, only render when the class is also not a Rs object and is not set to max one class allowed
+		// TODO might need to modify this last condition in the future
+		if (len(model.IdentifiedBy) > 0 && !(strings.HasPrefix(model.RnFormat, "rs") && model.MaxOneClassAllowed)) || model.Include {
 
 			// All classmodels have been read, thus now the model, child and relational resources names can be set
 			// When done before additional files would need to be opened and read which would slow down the generation process
@@ -726,7 +726,7 @@ func main() {
 			childMap := make(map[string]Model, 0)
 			for childName, childModel := range model.Children {
 				childModel.ChildResourceName = GetResourceName(childModel.PkgName, definitions)
-				if len(childModel.IdentifiedBy) > 0 {
+				if len(childModel.IdentifiedBy) > 0 && !(strings.HasPrefix(childModel.RnFormat, "rs") && childModel.MaxOneClassAllowed) {
 					// TODO add logic to determine the naming for plural child resources
 					childModel.ResourceNameDocReference = childModel.ChildResourceName
 					childModel.ResourceName = fmt.Sprintf("%ss", childModel.ChildResourceName)

gen/templates/provider.go.tmpl

@@ -204,7 +204,7 @@ func (p *AciProvider) Configure(ctx context.Context, req provider.ConfigureReque
 func (p *AciProvider) Resources(ctx context.Context) []func() resource.Resource {
 	return []func() resource.Resource{
 		{{- range . }}
-			{{- if and (or .IdentifiedBy .Include) (not (and .MaxOneClassAllowed (hasPrefix .RnFormat  "rs")))}}
+			{{- if or (and .IdentifiedBy (not (and .MaxOneClassAllowed (hasPrefix .RnFormat  "rs")))) .Include}}
 		New{{.ResourceClassName}}Resource,
 			{{- end }}
 		{{- end }}
@@ -215,7 +215,7 @@ func (p *AciProvider) Resources(ctx context.Context) []func() resource.Resource
 func (p *AciProvider) DataSources(ctx context.Context) []func() datasource.DataSource {
 	return []func() datasource.DataSource{
 		{{- range . }}
-			{{- if and (or .IdentifiedBy .Include) (not (and .MaxOneClassAllowed (hasPrefix .RnFormat  "rs")))}}
+			{{- if or (and .IdentifiedBy (not (and .MaxOneClassAllowed (hasPrefix .RnFormat  "rs")))) .Include}}
 		New{{.ResourceClassName}}DataSource,
 			{{- end }}
 		{{- end }}

gen/testvars/infraHPathS.yaml

@@ -26,7 +26,7 @@ all:
   owner_tag: "owner_tag_1"
 
 children:
-  relation_to_host_paths:
+  relation_to_host_path:
     - annotation: "annotation_1"
       target_dn: "target_dn_0"
       deletable_child: true