set unique id for data source city

circa10a · circa10a · commit f43cd952205f · 2020-11-09T12:50:14.000-06:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,27 @@
+on: [
+  push,
+  pull_request
+]
+name: Test
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [
+          1.15.x
+        ]
+        os: [
+          ubuntu-latest,
+        ]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Test
+      env:
+        TF_ACC: 1
+      run: go test ./...
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .terraform/
 *tfstate*
-terraform-provider-mcbroken
+terraform-provider-mcbroken
+*.log
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ PROVIDER_NAME=mcbroken
 PROVIDER_FULL_PATH=$(REGISTRY)/$(NAMESPACE)/$(PROVIDER_NAME)
 PROVIDER_FULL_NAME=terraform-provider-$(PROVIDER_NAME)
 PROJECT=$(NAMESPACE)/$(PROVIDER_FULL_NAME)
-VERSION=0.1.2
+VERSION=0.1.3
 
 build-mac: PLUGIN_DIR = ~/.terraform.d/plugins/local/provider/$(PROVIDER_NAME)/$(VERSION)/darwin_amd64
 build-mac:
@@ -15,6 +15,10 @@ build-linux:
 	test -d $(PLUGIN_DIR) || mkdir -p $(PLUGIN_DIR)
 	go build -o $(PLUGIN_DIR)/$(PROVIDER_FULL_NAME)
 
+test: export TF_ACC=true
+test:
+	go test -v ./...
+
 lint:
 	@if ! command -v golangci-lint 1>/dev/null; then\
 		echo "Need to install golangci-lint";\
diff --git a/README.md b/README.md
@@ -5,12 +5,13 @@
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/circa10a/terraform-provider-mcbroken?style=plastic)
 [![Buy Me A Coffee](https://img.shields.io/badge/BuyMeACoffee-Donate-ff813f.svg?logo=CoffeeScript&style=plastic)](https://www.buymeacoffee.com/caleblemoine)
 
-Base the count of your infrastucture resources on the national average of broken mcdonald's ice machines or by a city of your choosing. Powered by [Mcbroken](https://mcbroken.com/).
+Base the count of your infrastucture resources on the current number of broken mcdonald's ice machines nationally or by a city of your choosing. Powered by [Mcbroken](https://mcbroken.com/).
 
 - [terraform-provider-mcbroken](#terraform-provider-mcbroken)
   * [Usage](#usage)
   * [Development](#development)
     + [Linting](#linting)
+    + [Testing](#testing)
     + [Mac](#mac)
     + [Linux](#linux)
     + [Windows](#windows)
@@ -138,6 +139,12 @@ output "user_specified_city_not_found" {
 make lint
 ```
 
+### Testing
+
+```bash
+make test
+```
+
 ### Mac
 
 ```bash
diff --git a/docs/index.md b/docs/index.md
@@ -1,6 +1,6 @@
 # Mcbroken Provider
 
-Base the count of your infrastucture resources on the national average of broken mcdonald's ice machines or by a city of your choosing. Powered by [Mcbroken](https://mcbroken.com/).
+Base the count of your infrastucture resources on the current number of broken mcdonald's ice machines nationally or by a city of your choosing. Powered by [Mcbroken](https://mcbroken.com/).
 
 ## Example Usage
 
diff --git a/mcbroken/data_source_cities.go b/mcbroken/data_source_cities.go
@@ -81,7 +81,7 @@ func dataSourceCitiesRead(ctx context.Context, d *schema.ResourceData, m interfa
 		return diag.FromErr(err)
 	}
 
-	// Always run to give unique id
+	// Change ID every run to force update
 	d.SetId(strconv.FormatInt(time.Now().Unix(), 10))
 
 	return diags
diff --git a/mcbroken/data_source_cities_test.go b/mcbroken/data_source_cities_test.go
@@ -0,0 +1,48 @@
+package mcbroken
+
+import (
+	"regexp"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccMcbrokenCities(t *testing.T) {
+	brokenNumberRegex, _ := regexp.Compile(`\d{1,3}.\d{1,2}`)
+	cityRegex, _ := regexp.Compile(`\w`)
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { /* no precheck needed testAccPreCheck(t) */ },
+		ProviderFactories: testAccProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckCities(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"data.mcbroken_cities.all", "broken"),
+					resource.TestMatchResourceAttr(
+						"data.mcbroken_cities.all", "broken", brokenNumberRegex),
+					resource.TestCheckResourceAttrSet(
+						"data.mcbroken_cities.all", "cities.0.city"),
+					resource.TestCheckResourceAttrSet(
+						"data.mcbroken_cities.all", "cities.0.broken"),
+					resource.TestMatchResourceAttr(
+						"data.mcbroken_cities.all", "cities.0.city", cityRegex),
+					resource.TestMatchResourceAttr(
+						"data.mcbroken_cities.all", "cities.0.broken", brokenNumberRegex),
+					resource.TestCheckResourceAttrSet(
+						"data.mcbroken_cities.all", "cities.1.city"),
+					resource.TestCheckResourceAttrSet(
+						"data.mcbroken_cities.all", "cities.1.broken"),
+					resource.TestMatchResourceAttr(
+						"data.mcbroken_cities.all", "cities.1.city", cityRegex),
+					resource.TestMatchResourceAttr(
+						"data.mcbroken_cities.all", "cities.1.broken", brokenNumberRegex),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckCities() string {
+	return `data "mcbroken_cities" "all" {}`
+}
diff --git a/mcbroken/data_source_city.go b/mcbroken/data_source_city.go
@@ -3,7 +3,9 @@ package mcbroken
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 
@@ -68,7 +70,8 @@ func dataSourceCityRead(ctx context.Context, d *schema.ResourceData, m interface
 		}
 	}
 
-	d.SetId(userChosenCity)
+	// Change ID every run to force update
+	d.SetId(fmt.Sprintf("%v-%v", userChosenCity, strconv.FormatInt(time.Now().Unix(), 10)))
 
 	return diags
 }
diff --git a/mcbroken/data_source_city_test.go b/mcbroken/data_source_city_test.go
@@ -0,0 +1,50 @@
+package mcbroken
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccMcbrokenCity(t *testing.T) {
+	brokenNumberRegex, _ := regexp.Compile(`\d{1,3}.\d{1,2}`)
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { /* no precheck needed testAccPreCheck(t) */ },
+		ProviderFactories: testAccProviderFactories,
+		Steps: []resource.TestStep{
+			// valid city
+			{
+				Config: testAccCheckCity("Dallas"),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"data.mcbroken_city.dallas", "city", "dallas"),
+					resource.TestCheckResourceAttrSet(
+						"data.mcbroken_city.dallas", "broken"),
+					resource.TestMatchResourceAttr(
+						"data.mcbroken_city.dallas", "broken", brokenNumberRegex),
+				),
+			},
+			// invalid city
+			{
+				Config: testAccCheckCity("not_found"),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"data.mcbroken_city.not_found", "city", "not_found"),
+					resource.TestCheckResourceAttr(
+						"data.mcbroken_city.not_found", "broken", "-1"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckCity(city string) string {
+	return fmt.Sprintf(`
+data "mcbroken_city" "%[1]v" {
+  city = "%[1]v"
+}
+`, strings.ToLower(city))
+}
diff --git a/mcbroken/provider.go b/mcbroken/provider.go
@@ -2,20 +2,21 @@ package mcbroken
 
 import (
 	"context"
-	"net/url"
 
 	"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"
 )
 
 // Provider -
 func Provider() *schema.Provider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"url": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Default:  "https://mcbroken.com/stats.json",
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "https://mcbroken.com/stats.json",
+				ValidateFunc: validation.IsURLWithHTTPorHTTPS,
 			},
 		},
 		DataSourcesMap: map[string]*schema.Resource{
@@ -29,18 +30,6 @@ func Provider() *schema.Provider {
 func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 	var diags diag.Diagnostics
 	providerConfig := make(map[string]interface{})
-	mcbrokenEndpoint := d.Get("url").(string)
-
-	_, err := url.Parse(mcbrokenEndpoint)
-	if err != nil {
-		diags = append(diags, diag.Diagnostic{
-			Severity: diag.Error,
-			Summary:  "Unable to parse url",
-			Detail:   "Mcbroken endpoint provided is not a valid url",
-		})
-		return nil, diags
-	}
-
-	providerConfig["url"] = mcbrokenEndpoint
+	providerConfig["url"] = d.Get("url").(string)
 	return providerConfig, diags
 }
diff --git a/mcbroken/provider_test.go b/mcbroken/provider_test.go
@@ -0,0 +1,33 @@
+package mcbroken
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+var testAccProviders map[string]*schema.Provider
+var testAccProvider *schema.Provider
+var testAccProviderFactories map[string]func() (*schema.Provider, error)
+
+func init() {
+	testAccProvider = Provider()
+	testAccProviders = map[string]*schema.Provider{
+		"mcbroken": testAccProvider,
+	}
+	testAccProviderFactories = map[string]func() (*schema.Provider, error){
+		"mcbroken": func() (*schema.Provider, error) {
+			return testAccProvider, nil
+		},
+	}
+}
+
+func TestProvider(t *testing.T) {
+	if err := testAccProvider.InternalValidate(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestProvider_Impl(t *testing.T) {
+	var _ *schema.Provider = Provider()
+}

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func dataSourceCitiesRead(ctx context.Context, d *schema.ResourceData, m interfa`
`81`	`81`	`return diag.FromErr(err)`
`82`	`82`	`}`
`83`	`83`
`84`		`- // Always run to give unique id`
	`84`	`+ // Change ID every run to force update`
`85`	`85`	`d.SetId(strconv.FormatInt(time.Now().Unix(), 10))`
`86`	`86`
`87`	`87`	`return diags`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@ package mcbroken`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"encoding/json"`
	`6`	`+ "fmt"`
`6`	`7`	`"net/http"`
	`8`	`+ "strconv"`
`7`	`9`	`"strings"`
`8`	`10`	`"time"`
`9`	`11`
`@@ -68,7 +70,8 @@ func dataSourceCityRead(ctx context.Context, d *schema.ResourceData, m interface`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`
`71`		`- d.SetId(userChosenCity)`
	`73`	`+ // Change ID every run to force update`
	`74`	`+ d.SetId(fmt.Sprintf("%v-%v", userChosenCity, strconv.FormatInt(time.Now().Unix(), 10)))`
`72`	`75`
`73`	`76`	`return diags`
`74`	`77`	`}`