Merge pull request #102 from jeremmfr/bugfix-1.12.1

Release v1.12.2
jeremmfr · Feb 3, 2021 · 43d906e · 43d906e
2 parents 1179eb3 + 28c9427
commit 43d906e
Show file tree

Hide file tree

Showing 44 changed files with 87 additions and 83 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ ENHANCEMENTS:
 
 BUG FIXES:
 
+## 1.12.2 (February 3, 2021)
+BUG FIXES:
+* allow the name length of some objects > 32 for part of the resources (Fixes [#101](https://github.com/jeremmfr/terraform-provider-junos/issues/101))
+
 ## 1.12.1 (February 1, 2021)
 BUG FIXES:
 * possible mismatch for routing_instance in junos_interface_logical resource (Fixes #98)

diff --git a/junos/func_common.go b/junos/func_common.go
@@ -80,11 +80,11 @@ func validateCIDRNetwork(network string) error {
 	return nil
 }
 
-func validateNameObjectJunos(exclude []string) schema.SchemaValidateDiagFunc {
+func validateNameObjectJunos(exclude []string, length int) schema.SchemaValidateDiagFunc {
 	return func(i interface{}, path cty.Path) diag.Diagnostics {
 		var diags diag.Diagnostics
 		v := i.(string)
-		if strings.Count(v, "") > 32 {
+		if strings.Count(v, "") > length {
 			diags = append(diags, diag.Diagnostic{
 				Severity:      diag.Error,
 				Summary:       fmt.Sprintf("%s invalid name (too long)", i),

diff --git a/junos/resource_aggregate_route.go b/junos/resource_aggregate_route.go
@@ -46,7 +46,7 @@ func resourceAggregateRoute() *schema.Resource {
 				Optional:         true,
 				ForceNew:         true,
 				Default:          defaultWord,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"active": {
 				Type:          schema.TypeBool,

diff --git a/junos/resource_application.go b/junos/resource_application.go
@@ -30,7 +30,7 @@ func resourceApplication() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"protocol": {
 				Type:     schema.TypeString,

diff --git a/junos/resource_application_set.go b/junos/resource_application_set.go
@@ -28,7 +28,7 @@ func resourceApplicationSet() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"applications": {
 				Type:     schema.TypeList,

diff --git a/junos/resource_bgp_group.go b/junos/resource_bgp_group.go
@@ -24,14 +24,14 @@ func resourceBgpGroup() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"routing_instance": {
 				Type:             schema.TypeString,
 				Optional:         true,
 				ForceNew:         true,
 				Default:          defaultWord,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"type": {
 				Type:         schema.TypeString,

diff --git a/junos/resource_bgp_neighbor.go b/junos/resource_bgp_neighbor.go
@@ -31,13 +31,13 @@ func resourceBgpNeighbor() *schema.Resource {
 				Optional:         true,
 				ForceNew:         true,
 				Default:          defaultWord,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"group": {
 				Type:             schema.TypeString,
 				Required:         true,
 				ForceNew:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"accept_remote_nexthop": {
 				Type:     schema.TypeBool,

diff --git a/junos/resource_firewall_filter.go b/junos/resource_firewall_filter.go
@@ -31,7 +31,7 @@ func resourceFirewallFilter() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"family": {
 				Type:     schema.TypeString,
@@ -52,12 +52,12 @@ func resourceFirewallFilter() *schema.Resource {
 						"name": {
 							Type:             schema.TypeString,
 							Required:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"filter": {
 							Type:             schema.TypeString,
 							Optional:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"from": {
 							Type:     schema.TypeList,
@@ -236,7 +236,7 @@ func resourceFirewallFilter() *schema.Resource {
 									"policer": {
 										Type:             schema.TypeString,
 										Optional:         true,
-										ValidateDiagFunc: validateNameObjectJunos([]string{}),
+										ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 									},
 									"log": {
 										Type:     schema.TypeBool,

diff --git a/junos/resource_firewall_policer.go b/junos/resource_firewall_policer.go
@@ -32,7 +32,7 @@ func resourceFirewallPolicer() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"filter_specific": {
 				Type:     schema.TypeBool,

diff --git a/junos/resource_interface.go b/junos/resource_interface.go
@@ -322,22 +322,22 @@ func resourceInterface() *schema.Resource {
 			"inet_filter_input": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"inet_filter_output": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"inet6_filter_input": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"inet6_filter_output": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"inet_rpf_check": {
 				Type:     schema.TypeList,
@@ -418,12 +418,12 @@ func resourceInterface() *schema.Resource {
 			"security_zone": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"routing_instance": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 		},
 	}

diff --git a/junos/resource_interface_logical.go b/junos/resource_interface_logical.go
@@ -184,12 +184,12 @@ func resourceInterfaceLogical() *schema.Resource {
 						"filter_input": {
 							Type:             schema.TypeString,
 							Optional:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"filter_output": {
 							Type:             schema.TypeString,
 							Optional:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"rpf_check": {
 							Type:     schema.TypeList,
@@ -331,12 +331,12 @@ func resourceInterfaceLogical() *schema.Resource {
 						"filter_input": {
 							Type:             schema.TypeString,
 							Optional:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"filter_output": {
 							Type:             schema.TypeString,
 							Optional:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"rpf_check": {
 							Type:     schema.TypeList,
@@ -361,12 +361,12 @@ func resourceInterfaceLogical() *schema.Resource {
 			"security_zone": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"routing_instance": {
 				Type:             schema.TypeString,
 				Optional:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 		},
 	}

diff --git a/junos/resource_ospf_area.go b/junos/resource_ospf_area.go
@@ -38,7 +38,7 @@ func resourceOspfArea() *schema.Resource {
 				Optional:         true,
 				ForceNew:         true,
 				Default:          defaultWord,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"version": {
 				Type:         schema.TypeString,

diff --git a/junos/resource_policyoptions_as_path.go b/junos/resource_policyoptions_as_path.go
@@ -29,7 +29,7 @@ func resourcePolicyoptionsAsPath() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"path": {
 				Type:     schema.TypeString,

diff --git a/junos/resource_policyoptions_as_path_group.go b/junos/resource_policyoptions_as_path_group.go
@@ -29,7 +29,7 @@ func resourcePolicyoptionsAsPathGroup() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"as_path": {
 				Type:     schema.TypeList,
@@ -39,7 +39,7 @@ func resourcePolicyoptionsAsPathGroup() *schema.Resource {
 						"name": {
 							Type:             schema.TypeString,
 							Required:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"path": {
 							Type:     schema.TypeString,

diff --git a/junos/resource_policyoptions_community.go b/junos/resource_policyoptions_community.go
@@ -29,7 +29,7 @@ func resourcePolicyoptionsCommunity() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"members": {
 				Type:     schema.TypeList,

diff --git a/junos/resource_policyoptions_policy_statement.go b/junos/resource_policyoptions_policy_statement.go
@@ -33,7 +33,7 @@ func resourcePolicyoptionsPolicyStatement() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"from": {
 				Type:     schema.TypeList,
@@ -356,7 +356,7 @@ func resourcePolicyoptionsPolicyStatement() *schema.Resource {
 						"name": {
 							Type:             schema.TypeString,
 							Required:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 						"from": {
 							Type:     schema.TypeList,

diff --git a/junos/resource_policyoptions_prefix_list.go b/junos/resource_policyoptions_prefix_list.go
@@ -30,7 +30,7 @@ func resourcePolicyoptionsPrefixList() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"prefix": {
 				Type:     schema.TypeList,

diff --git a/junos/resource_rib_group.go b/junos/resource_rib_group.go
@@ -30,7 +30,7 @@ func resourceRibGroup() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 			},
 			"import_policy": {
 				Type:     schema.TypeList,

diff --git a/junos/resource_routing_instance.go b/junos/resource_routing_instance.go
@@ -29,7 +29,7 @@ func resourceRoutingInstance() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{"default"}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{"default"}, 64),
 			},
 			"type": {
 				Type:     schema.TypeString,

diff --git a/junos/resource_security_ike_gateway.go b/junos/resource_security_ike_gateway.go
@@ -42,7 +42,7 @@ func resourceIkeGateway() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 			},
 			"address": {
 				Type:         schema.TypeList,
@@ -241,7 +241,7 @@ func resourceIkeGateway() *schema.Resource {
 						"access_profile": {
 							Type:             schema.TypeString,
 							Optional:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 							ConflictsWith: []string{
 								"aaa.0.client_username",
 								"aaa.0.client_password",

diff --git a/junos/resource_security_ike_policy.go b/junos/resource_security_ike_policy.go
@@ -46,7 +46,7 @@ func resourceIkePolicy() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 			},
 			"proposals": {
 				Type:         schema.TypeList,

diff --git a/junos/resource_security_ike_proposal.go b/junos/resource_security_ike_proposal.go
@@ -34,7 +34,7 @@ func resourceIkeProposal() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 			},
 			"authentication_algorithm": {
 				Type:     schema.TypeString,

diff --git a/junos/resource_security_ipsec_policy.go b/junos/resource_security_ipsec_policy.go
@@ -31,7 +31,7 @@ func resourceIpsecPolicy() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 			},
 			"proposals": {
 				Type:         schema.TypeList,

diff --git a/junos/resource_security_ipsec_proposal.go b/junos/resource_security_ipsec_proposal.go
@@ -34,7 +34,7 @@ func resourceIpsecProposal() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 			},
 			"authentication_algorithm": {
 				Type:     schema.TypeString,

diff --git a/junos/resource_security_ipsec_vpn.go b/junos/resource_security_ipsec_vpn.go
@@ -35,7 +35,7 @@ func resourceIpsecVpn() *schema.Resource {
 				Type:             schema.TypeString,
 				ForceNew:         true,
 				Required:         true,
-				ValidateDiagFunc: validateNameObjectJunos([]string{}),
+				ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 			},
 			"establish_tunnels": {
 				Type:         schema.TypeString,
@@ -71,7 +71,7 @@ func resourceIpsecVpn() *schema.Resource {
 						"policy": {
 							Type:             schema.TypeString,
 							Required:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 						},
 						"identity_local": {
 							Type:         schema.TypeString,
@@ -86,7 +86,7 @@ func resourceIpsecVpn() *schema.Resource {
 						"identity_service": {
 							Type:             schema.TypeString,
 							Optional:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 64),
 						},
 					},
 				},
@@ -127,7 +127,7 @@ func resourceIpsecVpn() *schema.Resource {
 						"name": {
 							Type:             schema.TypeString,
 							Required:         true,
-							ValidateDiagFunc: validateNameObjectJunos([]string{}),
+							ValidateDiagFunc: validateNameObjectJunos([]string{}, 32),
 						},
 						"local_ip": {
 							Type:         schema.TypeString,