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 support for partner event bus and sources #19072

Merged
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4aed4f4
r/aws_cloudwatch_event_rule: Add 'TestAccAWSCloudWatchEventRule_Partn…
ewbankkit Mar 29, 2021
ab22c60
r/aws_cloudwatch_event_rule: Support partner event bus names.
ewbankkit Mar 29, 2021
6543ef8
r/aws_cloudwatch_event_permission: Add 'TestAccAWSCloudWatchEventPerm…
ewbankkit Mar 29, 2021
efc0114
r/aws_cloudwatch_event_permission: Support partner event bus names.
ewbankkit Mar 29, 2021
a975015
Revert "r/aws_cloudwatch_event_permission: Support partner event bus …
ewbankkit Mar 29, 2021
fe0a09c
Revert "r/aws_cloudwatch_event_permission: Add 'TestAccAWSCloudWatchE…
ewbankkit Mar 29, 2021
61e6000
Additional TestRuleParseID case.
ewbankkit Mar 29, 2021
025083e
r/aws_cloudwatch_event_target: Add 'TestAccAWSCloudWatchEventTarget_P…
ewbankkit Mar 30, 2021
627dcf1
r/aws_cloudwatch_event_target: Support partner event bus names.
ewbankkit Mar 30, 2021
81bbfcb
Add CHANGELOG entry.
ewbankkit Mar 30, 2021
addbc8f
Fix terraform errors.
ewbankkit Mar 31, 2021
f462b32
Some additional unit test cases.
ewbankkit Mar 31, 2021
7c92d94
Add 'TestPermissionParseID'.
ewbankkit Mar 31, 2021
57a396e
Add support for partner event bus and source
moensch Apr 23, 2021
357c023
d/aws_cloudwatch_event_source: New data source moved into #19219.
ewbankkit May 4, 2021
c3fd44a
r/aws_cloudwatch_event_bus: Tidy up partner event source acceptance t…
ewbankkit May 4, 2021
55f9b31
Merge remote-tracking branch 'ewbankkit/f-aws_cloudwatch_event_rule-p…
ewbankkit May 4, 2021
9e51097
Fix linter error "`partnerEventBusPattern` is unused (deadcode)".
ewbankkit May 4, 2021
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
Prev Previous commit
Next Next commit
r/aws_cloudwatch_event_permission: Add 'TestAccAWSCloudWatchEventPerm…
…ission_PartnerEventBus'.

Acceptance test output:

$ EVENT_BRIDGE_PARTNER_EVENT_BUS_NAME=aws.partner/datadog.com/TerraformTesting make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSCloudWatchEventPermission_PartnerEventBus'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSCloudWatchEventPermission_PartnerEventBus -timeout 180m
=== RUN   TestAccAWSCloudWatchEventPermission_PartnerEventBus
=== PAUSE TestAccAWSCloudWatchEventPermission_PartnerEventBus
=== CONT  TestAccAWSCloudWatchEventPermission_PartnerEventBus
    resource_aws_cloudwatch_event_permission_test.go:328: Step 1/2 error: Error running apply: exit status 1
        2021/03/29 17:37:22 [DEBUG] Using modified User-Agent: Terraform/0.12.26 HashiCorp-terraform-exec/0.13.0

        Error: Creating CloudWatch Events permission failed: ValidationException: 1 validation error detected: Value 'aws.partner/datadog.com/TerraformTesting' at 'eventBusName' failed to satisfy constraint: Member must satisfy regular expression pattern: [\.\-_A-Za-z0-9]+
        	status code: 400, request id: 8329ec8c-828c-4048-a665-60aaafd76f0d

          on terraform_plugin_test.tf line 2, in resource "aws_cloudwatch_event_permission" "test":
           2: resource "aws_cloudwatch_event_permission" "test" {

--- FAIL: TestAccAWSCloudWatchEventPermission_PartnerEventBus (3.87s)
FAIL
FAIL	github.com/terraform-providers/terraform-provider-aws/aws	3.961s
FAIL
GNUmakefile:27: recipe for target 'testacc' failed
make: *** [testacc] Error 1
  • Loading branch information
ewbankkit committed Apr 9, 2021
commit 6543ef8bf49cddfda2432002e9834731d2f020fb
45 changes: 45 additions & 0 deletions aws/resource_aws_cloudwatch_event_permission_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"log"
"os"
"regexp"
"testing"
"time"
Expand Down Expand Up @@ -314,6 +315,40 @@ func TestAccAWSCloudWatchEventPermission_Disappears(t *testing.T) {
})
}

func TestAccAWSCloudWatchEventPermission_PartnerEventBus(t *testing.T) {
key := "EVENT_BRIDGE_PARTNER_EVENT_BUS_NAME"
busName := os.Getenv(key)
if busName == "" {
t.Skipf("Environment variable %s is not set", key)
}

rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_cloudwatch_event_permission.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ErrorCheck: testAccErrorCheck(t, cloudwatchevents.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckCloudWatchEventPermissionDestroy,
Steps: []resource.TestStep{
{
Config: testAccCheckAwsCloudWatchEventPermissionPartnerEventBusConfig(rName, busName),
Check: resource.ComposeTestCheckFunc(
testAccCheckCloudWatchEventPermissionExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "event_bus_name", busName),
resource.TestCheckResourceAttr(resourceName, "principal", "111111111111"),
resource.TestCheckResourceAttr(resourceName, "statement_id", rName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccCheckCloudWatchEventPermissionExists(pr string) resource.TestCheckFunc {
return func(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).cloudwatcheventsconn
Expand Down Expand Up @@ -473,3 +508,13 @@ resource "aws_cloudwatch_event_permission" "test2" {
}
`, principal1, statementID1, principal2, statementID2)
}

func testAccCheckAwsCloudWatchEventPermissionPartnerEventBusConfig(rName, eventBusName string) string {
return fmt.Sprintf(`
resource "aws_cloudwatch_event_permission" "test" {
principal = "111111111111"
statement_id = %[1]q
event_bus_name = %[2]q
}
`, rName, eventBusName)
}