Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ability to Lookup AMP Workspace by Alias #28568

Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/28568.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
datasource/aws_prometheus_workspace: Add ability to query by workspace alias
```
37 changes: 37 additions & 0 deletions internal/service/amp/find.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,43 @@ func FindWorkspaceByID(ctx context.Context, conn *prometheusservice.PrometheusSe
return output.Workspace, nil
}

func FindWorkspaceByAlias(ctx context.Context, conn *prometheusservice.PrometheusService, alias string) (*prometheusservice.WorkspaceDescription, error) {
input := &prometheusservice.ListWorkspacesInput{
Alias: aws.String(alias),
}

var result *prometheusservice.WorkspaceSummary
err := conn.ListWorkspacesPages(input, func(page *prometheusservice.ListWorkspacesOutput, lastPage bool) bool {
if page == nil {
return !lastPage
}

for _, w := range page.Workspaces {
if w == nil {
continue
}

// ListWorkspaces returns all workspaces that begin with the given alias, so
// we need to return the result that matches the alias exactly.
if aws.StringValue(w.Alias) == alias {
result = w
return false
}
}
return !lastPage
})

if err != nil {
return nil, err
}
if result == nil {
return nil, tfresource.NewEmptyResultError(nil)
}

// Call FindWorkspaceByID so that we can return a WorkspaceDescription instead of a WorkspaceSummary.
return FindWorkspaceByID(ctx, conn, aws.StringValue(result.WorkspaceId))
}

func FindLoggingConfigurationByWorkspaceID(ctx context.Context, conn *prometheusservice.PrometheusService, id string) (*prometheusservice.LoggingConfigurationMetadata, error) {
input := &prometheusservice.DescribeLoggingConfigurationInput{
WorkspaceId: aws.String(id),
Expand Down
33 changes: 26 additions & 7 deletions internal/service/amp/workspace_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"context"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/prometheusservice"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
Expand All @@ -16,8 +18,10 @@ func DataSourceWorkspace() *schema.Resource {

Schema: map[string]*schema.Schema{
"alias": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Optional: true,
Computed: true,
ConflictsWith: []string{"workspace_id"},
},
"arn": {
Type: schema.TypeString,
Expand All @@ -37,8 +41,10 @@ func DataSourceWorkspace() *schema.Resource {
},
"tags": tftags.TagsSchemaComputed(),
"workspace_id": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Optional: true,
Computed: true,
ConflictsWith: []string{"alias"},
},
},
}
Expand All @@ -49,13 +55,26 @@ func dataSourceWorkspaceRead(ctx context.Context, d *schema.ResourceData, meta i
ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig

workspaceID := d.Get("workspace_id").(string)
workspace, err := FindWorkspaceByID(ctx, conn, workspaceID)
workspaceAlias := d.Get("alias").(string)

var workspace *prometheusservice.WorkspaceDescription
var err error

if workspaceID != "" {
workspace, err = FindWorkspaceByID(ctx, conn, workspaceID)
} else if workspaceAlias != "" {
workspace, err = FindWorkspaceByAlias(ctx, conn, workspaceAlias)
}

if err != nil {
return diag.Errorf("reading AMP Workspace (%s): %s", workspaceID, err)
if workspaceID != "" {
return diag.Errorf("reading AMP Workspace by ID (%s): %s", workspaceID, err)
} else {
return diag.Errorf("reading AMP Workspace by alias (%s): %s", workspaceAlias, err)
}
}

d.SetId(workspaceID)
d.SetId(aws.StringValue(workspace.WorkspaceId))

d.Set("alias", workspace.Alias)
d.Set("arn", workspace.Arn)
Expand Down
46 changes: 43 additions & 3 deletions internal/service/amp/workspace_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,33 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
)

func TestAccAMPWorkspaceDataSource_basic(t *testing.T) {
func TestAccAMPWorkspaceDataSource_workspace_id(t *testing.T) {
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_prometheus_workspace.test"
dataSourceName := "data.aws_prometheus_workspace.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(prometheusservice.EndpointsID, t) },
ErrorCheck: acctest.ErrorCheck(t, prometheusservice.EndpointsID),
CheckDestroy: nil,
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccWorkspaceDataSourceConfig_workspace_id(rName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(resourceName, "alias", dataSourceName, "alias"),
resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"),
resource.TestCheckResourceAttrSet(dataSourceName, "created_date"),
resource.TestCheckResourceAttrPair(resourceName, "prometheus_endpoint", dataSourceName, "prometheus_endpoint"),
resource.TestCheckResourceAttrSet(dataSourceName, "status"),
resource.TestCheckResourceAttrPair(resourceName, "tags.%", dataSourceName, "tags.%"),
),
},
},
})
}

func TestAccAMPWorkspaceDataSource_alias(t *testing.T) {
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_prometheus_workspace.test"
dataSourceName := "data.aws_prometheus_workspace.test"
Expand All @@ -36,14 +62,28 @@ func TestAccAMPWorkspaceDataSource_basic(t *testing.T) {
})
}

func testAccWorkspaceDataSourceConfig_alias(rName string) string {
func testAccWorkspaceBaseDataSourceConfig(rName string) string {
return fmt.Sprintf(`
resource "aws_prometheus_workspace" "test" {
alias = %[1]q
}
`, rName)
}

func testAccWorkspaceDataSourceConfig_workspace_id(rName string) string {
return acctest.ConfigCompose(
testAccWorkspaceBaseDataSourceConfig(rName), `
data "aws_prometheus_workspace" "test" {
workspace_id = aws_prometheus_workspace.test.id
}
`, rName)
`)
}

func testAccWorkspaceDataSourceConfig_alias(rName string) string {
return acctest.ConfigCompose(
testAccWorkspaceBaseDataSourceConfig(rName), `
data "aws_prometheus_workspace" "test" {
alias = aws_prometheus_workspace.test.alias
}
`)
}