Skip to content

Commit

Permalink
Merge pull request #292 from hashicorp/sebasslash/add-version-query-p…
Browse files Browse the repository at this point in the history
…arams

Version and search version query params for List TF Versions endpoint
  • Loading branch information
sebasslash committed Jan 21, 2022
2 parents 242e205 + 9cd01fa commit 3cf634a
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
6 changes: 6 additions & 0 deletions admin_terraform_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ type AdminTerraformVersion struct {
// terraform versions.
type AdminTerraformVersionsListOptions struct {
ListOptions

// A query string to find an exact version
Filter *string `url:"filter[version],omitempty"`

// A search query string to find all versions that match version substring
Search *string `url:"search[version],omitempty"`
}

// AdminTerraformVersionsList represents a list of terraform versions.
Expand Down
31 changes: 31 additions & 0 deletions admin_terraform_version_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package tfe

import (
"context"
"strings"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -62,6 +63,36 @@ func TestAdminTerraformVersions_List(t *testing.T) {
assert.NotNil(t, item.CreatedAt)
}
})

t.Run("with filter query string", func(t *testing.T) {
tfList, err := client.Admin.TerraformVersions.List(ctx, AdminTerraformVersionsListOptions{
Filter: String("1.0.4"),
})
require.NoError(t, err)
assert.Equal(t, 1, len(tfList.Items))

// Query for a Terraform version that does not exist
tfList, err = client.Admin.TerraformVersions.List(ctx, AdminTerraformVersionsListOptions{
Filter: String("1000.1000.42"),
})
require.NoError(t, err)
assert.Empty(t, tfList.Items)
})

t.Run("with search version query string", func(t *testing.T) {
searchVersion := "1.0"
tfList, err := client.Admin.TerraformVersions.List(ctx, AdminTerraformVersionsListOptions{
Search: String(searchVersion),
})
require.NoError(t, err)
assert.NotEmpty(t, tfList.Items)

t.Run("ensure each version matches substring", func(t *testing.T) {
for _, item := range tfList.Items {
assert.Equal(t, true, strings.Contains(item.Version, searchVersion))
}
})
})
}

func TestAdminTerraformVersions_CreateDelete(t *testing.T) {
Expand Down

0 comments on commit 3cf634a

Please sign in to comment.