From 6ef42b863ac973fdb7e18b6e3c62e5fa3857f545 Mon Sep 17 00:00:00 2001 From: Petro Protsakh Date: Fri, 9 Dec 2022 14:43:24 +0200 Subject: [PATCH 1/3] SCALRCORE-17414 Bump Go to v1.18 --- .github/workflows/default.yml | 4 ++-- go.mod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index e82770c..b49f43b 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: Set API_BRANCH if: ${{ contains(github.event.head_commit.message, '[API_BRANCH]') }} run: echo "API_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV diff --git a/go.mod b/go.mod index 5be4899..ebf0a27 100644 --- a/go.mod +++ b/go.mod @@ -15,4 +15,4 @@ require ( gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) -go 1.17 +go 1.18 From 80463cf3f49305478d71b82f1dc2a4cceb9a09f4 Mon Sep 17 00:00:00 2001 From: Petro Protsakh Date: Mon, 12 Dec 2022 12:23:26 +0200 Subject: [PATCH 2/3] SCALRCORE-17414 Fix tests affected by test environment changes --- README.md | 2 +- environment_tags_test.go | 6 +++--- workspace_tags_test.go | 6 +++--- workspace_test.go | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 7ef5c02..6a85d5c 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ func main() { } ``` -#Tests +## Tests You will need to set up the environment variables for your Scalr installation. For example: diff --git a/environment_tags_test.go b/environment_tags_test.go index 8eefd50..a7a77ad 100644 --- a/environment_tags_test.go +++ b/environment_tags_test.go @@ -65,7 +65,7 @@ func TestEnvironmentTagsAdd(t *testing.T) { t.Run("with invalid tag", func(t *testing.T) { tagID := "tag-invalid-id" err := client.EnvironmentTags.Add(ctx, environment.ID, []*TagRelation{{ID: tagID}}) - assert.EqualError(t, err, fmt.Sprintf("Invalid Attribute\n\nTag with ID '%s' not found or user unauthorized.", tagID)) + assert.EqualError(t, err, fmt.Sprintf("Validation Error\n\nTag with ID '%s' not found or user unauthorized.", tagID)) }) } @@ -110,7 +110,7 @@ func TestEnvironmentTagsReplace(t *testing.T) { t.Run("with invalid tag", func(t *testing.T) { tagID := "tag-invalid-id" err := client.EnvironmentTags.Replace(ctx, environment.ID, []*TagRelation{{ID: tagID}}) - assert.EqualError(t, err, fmt.Sprintf("Invalid Attribute\n\nTag with ID '%s' not found or user unauthorized.", tagID)) + assert.EqualError(t, err, fmt.Sprintf("Validation Error\n\nTag with ID '%s' not found or user unauthorized.", tagID)) }) t.Run("when all tags should be removed", func(t *testing.T) { @@ -159,6 +159,6 @@ func TestEnvironmentTagsDelete(t *testing.T) { t.Run("with invalid tag", func(t *testing.T) { tagID := "tag-invalid-id" err := client.EnvironmentTags.Replace(ctx, environment.ID, []*TagRelation{{ID: tagID}}) - assert.EqualError(t, err, fmt.Sprintf("Invalid Attribute\n\nTag with ID '%s' not found or user unauthorized.", tagID)) + assert.EqualError(t, err, fmt.Sprintf("Validation Error\n\nTag with ID '%s' not found or user unauthorized.", tagID)) }) } diff --git a/workspace_tags_test.go b/workspace_tags_test.go index 83dce39..a7fbf75 100644 --- a/workspace_tags_test.go +++ b/workspace_tags_test.go @@ -65,7 +65,7 @@ func TestWorkspaceTagsAdd(t *testing.T) { t.Run("with invalid tag", func(t *testing.T) { tagID := "tag-invalid-id" err := client.WorkspaceTags.Add(ctx, workspace.ID, []*TagRelation{{ID: tagID}}) - assert.EqualError(t, err, fmt.Sprintf("Invalid Attribute\n\nTag with ID '%s' not found or user unauthorized.", tagID)) + assert.EqualError(t, err, fmt.Sprintf("Validation Error\n\nTag with ID '%s' not found or user unauthorized.", tagID)) }) } @@ -110,7 +110,7 @@ func TestWorkspaceTagsReplace(t *testing.T) { t.Run("with invalid tag", func(t *testing.T) { tagID := "tag-invalid-id" err := client.WorkspaceTags.Replace(ctx, workspace.ID, []*TagRelation{{ID: tagID}}) - assert.EqualError(t, err, fmt.Sprintf("Invalid Attribute\n\nTag with ID '%s' not found or user unauthorized.", tagID)) + assert.EqualError(t, err, fmt.Sprintf("Validation Error\n\nTag with ID '%s' not found or user unauthorized.", tagID)) }) t.Run("when all tags should be removed", func(t *testing.T) { @@ -159,6 +159,6 @@ func TestWorkspaceTagsDelete(t *testing.T) { t.Run("with invalid tag", func(t *testing.T) { tagID := "tag-invalid-id" err := client.WorkspaceTags.Replace(ctx, workspace.ID, []*TagRelation{{ID: tagID}}) - assert.EqualError(t, err, fmt.Sprintf("Invalid Attribute\n\nTag with ID '%s' not found or user unauthorized.", tagID)) + assert.EqualError(t, err, fmt.Sprintf("Validation Error\n\nTag with ID '%s' not found or user unauthorized.", tagID)) }) } diff --git a/workspace_test.go b/workspace_test.go index 4d35eae..764785e 100644 --- a/workspace_test.go +++ b/workspace_test.go @@ -74,7 +74,7 @@ func TestWorkspacesCreate(t *testing.T) { AutoApply: Bool(true), ForceLatestRun: Bool(true), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeRemote), - TerraformVersion: String("0.12.25"), + TerraformVersion: String("1.1.9"), WorkingDirectory: String("bar/"), RunOperationTimeout: Int(15), AutoQueueRuns: AutoQueueRunsModePtr(AutoQueueRunsModeNever), @@ -111,7 +111,7 @@ func TestWorkspacesCreate(t *testing.T) { Name: String(randomString(t)), AutoApply: Bool(true), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeRemote), - TerraformVersion: String("0.12.25"), + TerraformVersion: String("1.1.9"), WorkingDirectory: String("bar/"), } @@ -273,7 +273,7 @@ func TestWorkspacesUpdate(t *testing.T) { AutoApply: Bool(true), ForceLatestRun: Bool(true), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeRemote), - TerraformVersion: String("0.12.25"), + TerraformVersion: String("1.1.9"), RunOperationTimeout: Int(20), AutoQueueRuns: AutoQueueRunsModePtr(AutoQueueRunsModeAlways), } @@ -318,7 +318,7 @@ func TestWorkspacesUpdate(t *testing.T) { AutoApply: Bool(false), ForceLatestRun: Bool(false), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeLocal), - TerraformVersion: String("0.12.25"), + TerraformVersion: String("1.1.9"), WorkingDirectory: String("baz/"), } @@ -373,7 +373,7 @@ func TestWorkspacesUpdateByID(t *testing.T) { AutoApply: Bool(true), ForceLatestRun: Bool(true), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeRemote), - TerraformVersion: String("0.12.25"), + TerraformVersion: String("1.1.9"), } wAfter, err := client.Workspaces.Update(ctx, wTest.ID, options) @@ -392,7 +392,7 @@ func TestWorkspacesUpdateByID(t *testing.T) { AutoApply: Bool(false), ForceLatestRun: Bool(false), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeLocal), - TerraformVersion: String("0.12.25"), + TerraformVersion: String("1.1.9"), WorkingDirectory: String("baz/"), } From f5fa964aff4de84c57de57ec9255b3030e7e5a1e Mon Sep 17 00:00:00 2001 From: Petro Protsakh Date: Mon, 12 Dec 2022 13:04:36 +0200 Subject: [PATCH 3/3] SCALRCORE-17414 Fix tests affected by test environment changes --- workspace_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workspace_test.go b/workspace_test.go index 764785e..cce5626 100644 --- a/workspace_test.go +++ b/workspace_test.go @@ -273,7 +273,7 @@ func TestWorkspacesUpdate(t *testing.T) { AutoApply: Bool(true), ForceLatestRun: Bool(true), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeRemote), - TerraformVersion: String("1.1.9"), + TerraformVersion: String("1.2.9"), RunOperationTimeout: Int(20), AutoQueueRuns: AutoQueueRunsModePtr(AutoQueueRunsModeAlways), } @@ -373,7 +373,7 @@ func TestWorkspacesUpdateByID(t *testing.T) { AutoApply: Bool(true), ForceLatestRun: Bool(true), ExecutionMode: WorkspaceExecutionModePtr(WorkspaceExecutionModeRemote), - TerraformVersion: String("1.1.9"), + TerraformVersion: String("1.2.9"), } wAfter, err := client.Workspaces.Update(ctx, wTest.ID, options)