Merge pull request #1074 from PagerDuty/contact-method-err

False positive validation error on pagerduty_user_contact_method

Author: cjgajard

pagerduty/config.go

@@ -127,7 +127,7 @@ func (c *Config) Client() (*pagerduty.Client, error) {
 		})
 
 		if err != nil {
-			return nil, fmt.Errorf(fmt.Sprintf("%s\n%s", err, invalidCreds))
+			return nil, fmt.Errorf("%s\n%s", err, invalidCreds)
 		}
 	}
 

pagerduty/provider.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"regexp"
@@ -282,14 +283,14 @@ func expandAppOauthTokenParams(v interface{}) *persistentconfig.AppOauthScopedTo
 	return aotp
 }
 
-var validationAuthMethodConfigWarning = "PagerDuty Provider has been set to authenticate API calls utilizing API token and App Oauth token at same time, in this scenario the use of App Oauth token is prioritised over API token authentication configuration. It is recommended to explicitely set just one authentication method.\nWe also suggest you to check your environment variables in case `token` being automatically read by Provider configuration through `PAGERDUTY_TOKEN` environment variable."
+var authMethodConfigErr = errors.New("PagerDuty Provider has been set to authenticate API calls utilizing API token and App Oauth token at same time, in this scenario the use of App Oauth token is prioritised over API token authentication configuration. It is recommended to explicitely set just one authentication method.\nWe also suggest you to check your environment variables in case `token` being automatically read by Provider configuration through `PAGERDUTY_TOKEN` environment variable.")
 
 func validateAuthMethodConfig(data *schema.ResourceData) error {
 	_, isSetAPIToken := data.GetOk("token")
 	_, isSetUseAppOauthScopedToken := data.GetOk("use_app_oauth_scoped_token")
 
 	if isSetUseAppOauthScopedToken && isSetAPIToken {
-		return fmt.Errorf(validationAuthMethodConfigWarning)
+		return authMethodConfigErr
 	}
 
 	return nil

pagerdutyplugin/config.go

@@ -139,7 +139,7 @@ func (c *Config) Client(ctx context.Context) (*pagerduty.Client, error) {
 			return nil
 		})
 		if err != nil {
-			return nil, fmt.Errorf(fmt.Sprintf("%s\n%s", err, invalidCreds))
+			return nil, fmt.Errorf("%s\n%s", err, invalidCreds)
 		}
 	}
 	c.client = client

util/validate_contact_address.go

@@ -35,6 +35,12 @@ func (v contactAddressValidator) ValidateString(ctx context.Context, req validat
 	if resp.Diagnostics.HasError() {
 		return
 	}
+
+	// Skip validation if any required value is unknown (e.g., from variable references)
+	if typeConfig.IsUnknown() || req.ConfigValue.IsUnknown() {
+		return
+	}
+
 	t := typeConfig.ValueString()
 	code := int(countryCode.ValueInt64())
 	addr := req.ConfigValue.ValueString()