Fix tests for protocol v6

PagerDuty · Apr 4, 2024 · eb3b1f3 · eb3b1f3
1 parent 15e0050
commit eb3b1f3
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/pagerduty/provider.go b/pagerduty/provider.go
@@ -195,7 +195,7 @@ func handleNotFoundError(err error, d *schema.ResourceData) error {
 	return genError(err, d)
 }
 
-func providerConfigureContextFunc(ctx context.Context, data *schema.ResourceData, terraformVersion string) (interface{}, diag.Diagnostics) {
+func providerConfigureContextFunc(_ context.Context, data *schema.ResourceData, terraformVersion string) (interface{}, diag.Diagnostics) {
 	var diags diag.Diagnostics
 	serviceRegion := strings.ToLower(data.Get("service_region").(string))
 
@@ -225,7 +225,7 @@ func providerConfigureContextFunc(ctx context.Context, data *schema.ResourceData
 		if err := validateAuthMethodConfig(data); err != nil {
 			diag := diag.Diagnostic{
 				Severity: diag.Warning,
-				Summary:  fmt.Sprint("`token` and `use_app_oauth_scoped_token` are both configured at the same time"),
+				Summary:  "`token` and `use_app_oauth_scoped_token` are both configured at the same time",
 				Detail:   err.Error(),
 			}
 			diags = append(diags, diag)

diff --git a/pagerdutyplugin/data_source_pagerduty_extension_schema_test.go b/pagerdutyplugin/data_source_pagerduty_extension_schema_test.go
@@ -13,7 +13,7 @@ import (
 func TestAccDataSourcePagerDutyExtensionSchema_Basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyScheduleDestroy,
 		Steps: []resource.TestStep{
 			{

diff --git a/pagerdutyplugin/data_source_pagerduty_tag_test.go b/pagerdutyplugin/data_source_pagerduty_tag_test.go
@@ -14,7 +14,7 @@ func TestAccDataSourcePagerDutyTag_Basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourcePagerDutyTagConfig(tag),

diff --git a/pagerdutyplugin/import_pagerduty_extension_servicenow_test.go b/pagerdutyplugin/import_pagerduty_extension_servicenow_test.go
@@ -15,7 +15,7 @@ func TestAccPagerDutyExtensionServiceNow_import(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyExtensionServiceNowDestroy,
 		Steps: []resource.TestStep{
 			{

diff --git a/pagerdutyplugin/import_pagerduty_extension_test.go b/pagerdutyplugin/import_pagerduty_extension_test.go
@@ -15,7 +15,7 @@ func TestAccPagerDutyExtension_import(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyExtensionDestroy,
 		Steps: []resource.TestStep{
 			{

diff --git a/pagerdutyplugin/import_pagerduty_tag_assignment_test.go b/pagerdutyplugin/import_pagerduty_tag_assignment_test.go
@@ -14,9 +14,9 @@ func TestAccPagerDutyTagAssignment_import(t *testing.T) {
 	team := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckPagerDutyTagAssignmentDestroy,
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
+		CheckDestroy:             testAccCheckPagerDutyTagAssignmentDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccCheckPagerDutyTagAssignmentTeamConfig(tag, team),

diff --git a/pagerdutyplugin/import_pagerduty_tag_test.go b/pagerdutyplugin/import_pagerduty_tag_test.go
@@ -13,7 +13,7 @@ func TestAccPagerDutyTag_import(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyTagDestroy,
 		Steps: []resource.TestStep{
 			{

diff --git a/pagerdutyplugin/resource_pagerduty_extension_servicenow_test.go b/pagerdutyplugin/resource_pagerduty_extension_servicenow_test.go
@@ -49,7 +49,7 @@ func TestAccPagerDutyExtensionServiceNow_Basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyExtensionServiceNowDestroy,
 		Steps: []resource.TestStep{
 			{

diff --git a/pagerdutyplugin/resource_pagerduty_extension_test.go b/pagerdutyplugin/resource_pagerduty_extension_test.go
@@ -49,7 +49,7 @@ func TestAccPagerDutyExtension_Basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyExtensionDestroy,
 		Steps: []resource.TestStep{
 			{

diff --git a/pagerdutyplugin/resource_pagerduty_tag_assignment.go b/pagerdutyplugin/resource_pagerduty_tag_assignment.go
@@ -145,7 +145,7 @@ func (r *resourceTagAssignment) requestGetTagAssignents(ctx context.Context, mod
 	})
 	if err != nil {
 		diags.AddError(
-			fmt.Sprintf("Error reading tags for %d entity with ID %s", assign.EntityType, assign.EntityID),
+			fmt.Sprintf("Error reading tags for %s entity with ID %s", assign.EntityType, assign.EntityID),
 			err.Error(),
 		)
 	}
@@ -187,7 +187,7 @@ func (r *resourceTagAssignment) isFoundTagAssignment(ctx context.Context, entity
 	})
 	if err != nil {
 		diags.AddError(
-			fmt.Sprintf("Error finding %s entity with ID %d", entityType, entityID),
+			fmt.Sprintf("Error finding %s entity with ID %s", entityType, entityID),
 			err.Error(),
 		)
 		isFound = false

diff --git a/pagerdutyplugin/resource_pagerduty_tag_assignment_test.go b/pagerdutyplugin/resource_pagerduty_tag_assignment_test.go
@@ -19,7 +19,7 @@ func TestAccPagerDutyTagAssignment_User(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyTagAssignmentDestroy,
 		Steps: []resource.TestStep{
 			{
@@ -70,7 +70,7 @@ func TestAccPagerDutyTagAssignment_Team(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyTagAssignmentDestroy,
 		Steps: []resource.TestStep{
 			{
@@ -121,7 +121,7 @@ func TestAccPagerDutyTagAssignment_EP(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyTagAssignmentDestroy,
 		Steps: []resource.TestStep{
 			{

diff --git a/pagerdutyplugin/resource_pagerduty_tag_test.go b/pagerdutyplugin/resource_pagerduty_tag_test.go
@@ -46,7 +46,7 @@ func TestAccPagerDutyTag_Basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
-		ProtoV5ProviderFactories: testAccProtoV5ProviderFactories(),
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories(),
 		CheckDestroy:             testAccCheckPagerDutyTagDestroy,
 		Steps: []resource.TestStep{
 			{