Merge pull request #124 from SumoLogic/ssain-gh-action-test

Switch to GitHub Actions

Author: seansain

.github/workflows/test.yml

@@ -0,0 +1,90 @@
+# This GitHub action runs your tests for each commit push and/or PR. Optionally
+# you can turn it on using a cron schedule for regular testing.
+#
+name: Tests
+on:
+  pull_request:
+    branches: [ master ]
+    paths-ignore:
+      - 'README.md'
+  push:
+    branches: [ master ]
+    paths-ignore:
+      - 'README.md'
+  # For systems with an upstream API that could drift unexpectedly (like most SaaS systems, etc.),
+  # we recommend testing at a regular interval not necessarily tied to code changes. This will 
+  # ensure you are alerted to something breaking due to an API change, even if the code did not
+  # change.
+  # schedule:
+  #   - cron: '0 13 * * *'
+jobs:
+  # ensure the code builds...
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+
+    - name: Set up Go
+      uses: actions/[email protected]
+      with:
+        go-version: '1.15'
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/[email protected]
+
+    - name: Get dependencies
+      run: |
+        go mod download
+    - name: Build
+      run: |
+        go build -v .
+  # run acceptance tests in a matrix with Terraform core versions
+  test:
+    name: Matrix Test
+    needs: build
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        # list whatever Terraform versions here you would like to support
+        terraform:
+#           - '0.12.29'
+          - '0.13.4'
+#           - '0.14.0-beta2'
+    steps:
+
+    - name: Set up Go
+      uses: actions/[email protected]
+      with:
+        go-version: '1.15'
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/[email protected]
+
+    - name: Get dependencies
+      run: |
+        go mod download
+        
+    - name: TF acceptance tests
+      timeout-minutes: 10
+      env:
+        TF_ACC: "1"
+        TF_ACC_TERRAFORM_VERSION: ${{ matrix.terraform }}
+
+        # Set whatever additional acceptance test env vars here. You can
+        # optionally use data from your repository secrets using the
+        # following syntax:
+        # SOME_VAR: ${{ secrets.SOME_VAR }}
+        SUMOLOGIC_ACCESSID: ${{ secrets.SUMOLOGIC_ACCESSID }}
+        SUMOLOGIC_ACCESSKEY:  ${{ secrets.SUMOLOGIC_ACCESSKEY }}
+        SUMOLOGIC_ENVIRONMENT:  ${{ secrets.SUMOLOGIC_ENVIRONMENT }}
+        SUMOLOGIC_TEST_AWS_ID:  ${{ secrets.SUMOLOGIC_TEST_AWS_ID }}
+        SUMOLOGIC_TEST_AWS_KEY:  ${{ secrets.SUMOLOGIC_TEST_AWS_KEY }}
+        SUMOLOGIC_TEST_BUCKET_NAME:  ${{ secrets.SUMOLOGIC_TEST_BUCKET_NAME }}
+
+      run: |
+        go test -v -cover ./sumologic/

.travis.yml

@@ -13,6 +13,7 @@ package sumologic
 
 import (
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
@@ -66,7 +67,19 @@ func resourceSumologicSubdomainCreate(d *schema.ResourceData, meta interface{})
 		id, err := c.CreateSubdomain(subdomain)
 
 		if err != nil {
-			return err
+			if strings.Contains(err.Error(), "subdomain:already_configured") {
+				updatedID, updateErr := c.UpdateSubdomain(subdomain)
+				if updateErr != nil {
+					if updatedID == "" {
+						id = subdomain.Subdomain
+					} else {
+						return updateErr
+					}
+				}
+				id = updatedID
+			} else {
+				return err
+			}
 		}
 
 		d.SetId(id)
@@ -86,7 +99,7 @@ func resourceSumologicSubdomainUpdate(d *schema.ResourceData, meta interface{})
 
 	subdomain := resourceToSubdomain(d)
 
-	err := c.UpdateSubdomain(subdomain)
+	_, err := c.UpdateSubdomain(subdomain)
 	if err != nil {
 		return err
 	}

sumologic/resource_sumologic_subdomain.go

@@ -59,11 +59,18 @@ func (s *Client) DeleteSubdomain() error {
 	return err
 }
 
-func (s *Client) UpdateSubdomain(subdomain Subdomain) error {
+func (s *Client) UpdateSubdomain(subdomain Subdomain) (string, error) {
 	urlWithoutParams := "v1/account/subdomain"
 
-	_, err := s.Put(urlWithoutParams, subdomain)
-	return err
+	data, err := s.Put(urlWithoutParams, subdomain)
+
+	var updatedSubdomain Subdomain
+	err = json.Unmarshal(data, &updatedSubdomain)
+	if err != nil {
+		return "", err
+	}
+
+	return updatedSubdomain.Subdomain, err
 }
 
 type Subdomain struct {