fix provider

DrFaust92 · Sep 21, 2021 · 1274368 · 1274368
1 parent d888d33
commit 1274368
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/pingdom/config.go b/pingdom/config.go
@@ -13,7 +13,7 @@ import (
 type Config struct {
 	APIToken           string `mapstructure:"api_token"`
 	SolarwindsUser     string `mapstructure:"solarwinds_user"`
-	SolarwindsPassword string `mapstructure:"solarwinds_password"`
+	SolarwindsPassword string `mapstructure:"solarwinds_passwd"`
 	SolarwindsOrgID    string `mapstructure:"solarwinds_org_id"`
 }
 

diff --git a/pingdom/provider.go b/pingdom/provider.go
@@ -33,9 +33,8 @@ func Provider() *schema.Provider {
 			"pingdom_contact":     resourcePingdomContact(),
 			"pingdom_integration": resourcePingdomIntegration(),
 			"pingdom_maintenance": resourcePingdomMaintenance(),
-			// "pingdom_user":        resourceSolarwindsUser(),
-			"pingdom_occurrence": resourcePingdomOccurrences(),
-			"pingdom_tms_check":  resourcePingdomTmsCheck(),
+			"pingdom_occurrence":  resourcePingdomOccurrences(),
+			"pingdom_tms_check":   resourcePingdomTmsCheck(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"pingdom_contact":      dataSourcePingdomContact(),

diff --git a/pingdom/provider_test.go b/pingdom/provider_test.go
@@ -68,12 +68,15 @@ func testAccPreCheck(t *testing.T) {
 	if v := os.Getenv("PINGDOM_API_TOKEN"); v == "" {
 		t.Fatal("PINGDOM_API_TOKEN environment variable must be set for acceptance tests")
 	}
-	// if v := os.Getenv("SOLARWINDS_USER"); v == "" {
-	// 	t.Fatal("SOLARWINDS_USER environment variable must be set for acceptance tests")
-	// }
-	// if v := os.Getenv("SOLARWINDS_PASSWD"); v == "" {
-	// 	t.Fatal("SOLARWINDS_PASSWD environment variable must be set for acceptance tests")
-	// }
+	if v := os.Getenv("SOLARWINDS_USER"); v == "" {
+		t.Fatal("SOLARWINDS_USER environment variable must be set for acceptance tests")
+	}
+	if v := os.Getenv("SOLARWINDS_PASSWD"); v == "" {
+		t.Fatal("SOLARWINDS_PASSWD environment variable must be set for acceptance tests")
+	}
+	if v := os.Getenv("SOLARWINDS_ORG_ID"); v == "" {
+		t.Fatal("SOLARWINDS_ORG_ID environment variable must be set for acceptance tests")
+	}
 }
 
 func testAccCheckPingdomResourceID(name string) resource.TestCheckFunc {

diff --git a/pingdom/resource_pingdom_integration.go b/pingdom/resource_pingdom_integration.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/nordcloud/go-pingdom/pingdomext"
 )
 
@@ -39,8 +40,9 @@ func resourcePingdomIntegration() *schema.Resource {
 				Required: true,
 			},
 			"url": {
-				Type:     schema.TypeString,
-				Optional: true,
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.IsURLWithHTTPorHTTPS,
 			},
 		},
 	}