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.

Sign up for GitHub

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

resource/aws_prometheus_scraper: Fix Provider returned invalid result object after apply error #35844

Merged
merged 3 commits into from
Feb 16, 2024
Merged

resource/aws_prometheus_scraper: Fix Provider returned invalid result object after apply error #35844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e11a3d0
Adds `UseStateForUnknown` to `role_arn`
gdavison Feb 15, 2024
7e6c05a
Removes unused `eksClusterVersion` parameter
gdavison Feb 15, 2024
3244027
Adds CHANGELOG entry
gdavison Feb 15, 2024
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/35844.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_prometheus_scraper: Fixes invalid result after apply error.
```
3 changes: 3 additions & 0 deletions internal/service/amp/scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ func (r *scraperResource) Schema(ctx context.Context, req resource.SchemaRequest
names.AttrID: framework.IDAttribute(),
"role_arn": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
},
},
"scrape_configuration": schema.StringAttribute{
Required: true,
Expand Down
43 changes: 19 additions & 24 deletions internal/service/amp/scraper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ func TestAccAMPScraper_basic(t *testing.T) {

var scraper types.ScraperDescription
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
eksClusterVersion := "1.28"
resourceName := "aws_prometheus_scraper.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -39,7 +38,7 @@ func TestAccAMPScraper_basic(t *testing.T) {
CheckDestroy: testAccCheckScraperDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccScraperConfig_basic(rName, eksClusterVersion),
Config: testAccScraperConfig_basic(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckScraperExists(ctx, resourceName, &scraper),
resource.TestCheckNoResourceAttr(resourceName, "alias"),
Expand Down Expand Up @@ -71,7 +70,6 @@ func TestAccAMPScraper_disappears(t *testing.T) {

var scraper types.ScraperDescription
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
eksClusterVersion := "1.28"
resourceName := "aws_prometheus_scraper.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -81,7 +79,7 @@ func TestAccAMPScraper_disappears(t *testing.T) {
CheckDestroy: testAccCheckScraperDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccScraperConfig_basic(rName, eksClusterVersion),
Config: testAccScraperConfig_basic(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckScraperExists(ctx, resourceName, &scraper),
acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfamp.ResourceScraper, resourceName),
Expand All @@ -101,7 +99,6 @@ func TestAccAMPScraper_tags(t *testing.T) {

var scraper types.ScraperDescription
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
eksClusterVersion := "1.28"
resourceName := "aws_prometheus_scraper.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -111,7 +108,7 @@ func TestAccAMPScraper_tags(t *testing.T) {
CheckDestroy: testAccCheckScraperDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccScraperConfig_tags1(rName, eksClusterVersion, "key1", "value1"),
Config: testAccScraperConfig_tags1(rName, "key1", "value1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckScraperExists(ctx, resourceName, &scraper),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
Expand All @@ -124,7 +121,7 @@ func TestAccAMPScraper_tags(t *testing.T) {
ImportStateVerify: true,
},
{
Config: testAccScraperConfig_tags2(rName, eksClusterVersion, "key1", "value1updated", "key2", "value2"),
Config: testAccScraperConfig_tags2(rName, "key1", "value1updated", "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckScraperExists(ctx, resourceName, &scraper),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
Expand All @@ -133,7 +130,7 @@ func TestAccAMPScraper_tags(t *testing.T) {
),
},
{
Config: testAccScraperConfig_tags1(rName, eksClusterVersion, "key2", "value2"),
Config: testAccScraperConfig_tags1(rName, "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckScraperExists(ctx, resourceName, &scraper),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
Expand All @@ -153,7 +150,6 @@ func TestAccAMPScraper_alias(t *testing.T) {

var scraper types.ScraperDescription
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
eksClusterVersion := "1.28"
resourceName := "aws_prometheus_scraper.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -163,7 +159,7 @@ func TestAccAMPScraper_alias(t *testing.T) {
CheckDestroy: testAccCheckScraperDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccScraperConfig_alias(rName, eksClusterVersion),
Config: testAccScraperConfig_alias(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckScraperExists(ctx, resourceName, &scraper),
resource.TestCheckResourceAttr(resourceName, "alias", rName),
Expand All @@ -187,7 +183,6 @@ func TestAccAMPScraper_securityGroups(t *testing.T) {

var scraper types.ScraperDescription
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
eksClusterVersion := "1.28"
resourceName := "aws_prometheus_scraper.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -197,7 +192,7 @@ func TestAccAMPScraper_securityGroups(t *testing.T) {
CheckDestroy: testAccCheckScraperDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccScraperConfig_securityGroups(rName, eksClusterVersion),
Config: testAccScraperConfig_securityGroups(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckScraperExists(ctx, resourceName, &scraper),
resource.TestCheckResourceAttr(resourceName, "source.0.eks.0.security_group_ids.#", "1"),
Expand Down Expand Up @@ -332,7 +327,7 @@ scrape_configs:
replacement: $1:10249
`

func testAccScraperConfig_base(rName, eksClusterVersion string) string {
func testAccScraperConfig_base(rName string) string {
return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
data "aws_partition" "current" {}

Expand Down Expand Up @@ -405,11 +400,11 @@ resource "aws_prometheus_workspace" "test" {
AMPAgentlessScraper = ""
}
}
`, rName, eksClusterVersion))
`, rName))
}

func testAccScraperConfig_basic(rName, eksClusterVersion string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName, eksClusterVersion), fmt.Sprintf(`
func testAccScraperConfig_basic(rName string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName), fmt.Sprintf(`
resource "aws_prometheus_scraper" "test" {
scrape_configuration = %[1]q

Expand All @@ -429,8 +424,8 @@ resource "aws_prometheus_scraper" "test" {
`, scrapeConfigBlob))
}

func testAccScraperConfig_tags1(rName, eksClusterVersion, tagKey1, tagValue1 string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName, eksClusterVersion), fmt.Sprintf(`
func testAccScraperConfig_tags1(rName, tagKey1, tagValue1 string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName), fmt.Sprintf(`
resource "aws_prometheus_scraper" "test" {
scrape_configuration = %[3]q

Expand All @@ -454,8 +449,8 @@ resource "aws_prometheus_scraper" "test" {
`, tagKey1, tagValue1, scrapeConfigBlob))
}

func testAccScraperConfig_tags2(rName, eksClusterVersion, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName, eksClusterVersion), fmt.Sprintf(`
func testAccScraperConfig_tags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName), fmt.Sprintf(`
resource "aws_prometheus_scraper" "test" {
scrape_configuration = %[5]q

Expand All @@ -480,8 +475,8 @@ resource "aws_prometheus_scraper" "test" {
`, tagKey1, tagValue1, tagKey2, tagValue2, scrapeConfigBlob))
}

func testAccScraperConfig_alias(rName, eksClusterVersion string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName, eksClusterVersion), fmt.Sprintf(`
func testAccScraperConfig_alias(rName string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName), fmt.Sprintf(`
resource "aws_prometheus_scraper" "test" {
alias = %[1]q
scrape_configuration = %[2]q
Expand All @@ -502,8 +497,8 @@ resource "aws_prometheus_scraper" "test" {
`, rName, scrapeConfigBlob))
}

func testAccScraperConfig_securityGroups(rName, eksClusterVersion string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName, eksClusterVersion), fmt.Sprintf(`
func testAccScraperConfig_securityGroups(rName string) string {
return acctest.ConfigCompose(testAccScraperConfig_base(rName), fmt.Sprintf(`
resource "aws_prometheus_scraper" "test" {
alias = %[1]q
scrape_configuration = %[2]q
Expand Down
Loading