Skip to content

Commit

Permalink
Merged automatically by CI pipeline
Browse files Browse the repository at this point in the history
SCALRCORE-17414 [go-scalr] Migrate to Terraform Plugin SDKv2
  • Loading branch information
emocharnik committed Dec 30, 2022
2 parents a98c1c6 + f5fa964 commit 99389a2
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func main() {
}
```

#Tests
## Tests

You will need to set up the environment variables for your Scalr installation. For example:

Expand Down
6 changes: 3 additions & 3 deletions environment_tags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
})
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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))
})
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ require (
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)

go 1.17
go 1.18
6 changes: 3 additions & 3 deletions workspace_tags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
})
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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))
})
}
12 changes: 6 additions & 6 deletions workspace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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/"),
}

Expand Down Expand Up @@ -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.2.9"),
RunOperationTimeout: Int(20),
AutoQueueRuns: AutoQueueRunsModePtr(AutoQueueRunsModeAlways),
}
Expand Down Expand Up @@ -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/"),
}

Expand Down Expand Up @@ -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.2.9"),
}

wAfter, err := client.Workspaces.Update(ctx, wTest.ID, options)
Expand All @@ -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/"),
}

Expand Down

0 comments on commit 99389a2

Please sign in to comment.