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

[Synthetics] Add support for restricted roles for global variables #1178

Merged
merged 14 commits into from
Aug 23, 2021
Merged

[Synthetics] Add support for restricted roles for global variables #1178

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1d6ad1f
Update go client
romainberger Aug 18, 2021
6ff5100
[Synthetics] Add support for restricted roles for global variables
romainberger Aug 19, 2021
1ef657a
[Synthetics] Update description for secure parameter for global variable
romainberger Aug 20, 2021
de48e01
[Synthetics] Fix review
romainberger Aug 20, 2021
fab31c1
Regenerate docs
romainberger Aug 20, 2021
c57f68f
Update go client
romainberger Aug 18, 2021
c8513ea
[Synthetics] Add support for restricted roles for global variables
romainberger Aug 19, 2021
540436a
[Synthetics] Update description for secure parameter for global variable
romainberger Aug 20, 2021
bf69541
[Synthetics] Fix review
romainberger Aug 20, 2021
86ffa83
Regenerate docs
romainberger Aug 20, 2021
d364a5f
Merge branch 'master' of github.com:DataDog/terraform-provider-datado…
romainberger Aug 23, 2021
3010387
Merge branch 'master' of github.com:DataDog/terraform-provider-datado…
romainberger Aug 23, 2021
88c57bc
Merge branch 'rberger/SYA-1073/gv-restricted-roles' of github.com:Dat…
romainberger Aug 23, 2021
072ec7b
[Synthetics] Fix dependencie and cassettes
romainberger Aug 23, 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
23 changes: 22 additions & 1 deletion datadog/resource_datadog_synthetics_global_variable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func resourceDatadogSyntheticsGlobalVariable() *schema.Resource {
Sensitive: true,
},
"secure": {
Description: "Sets the variable as secure. Defaults to `false`.",
Description: "If set to true, the value of the global variable will be hidden. Defaults to `false`.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to need to run make docs
Also I think

Suggested change
Description: "If set to true, the value of the global variable will be hidden. Defaults to `false`.",
Description: "If set to true, the value of the global variable is hidden. Defaults to `false`.",

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on that, we try to avoid future tense as often as we can!

Default: false,
Type: schema.TypeBool,
Optional: true,
Expand Down Expand Up @@ -99,6 +99,12 @@ func resourceDatadogSyntheticsGlobalVariable() *schema.Resource {
},
},
},
"restricted_roles": {
Description: "A list of role identifiers to associate with the Synthetics global variable",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Description: "A list of role identifiers to associate with the Synthetics global variable",
Description: "A list of role identifiers to associate with the Synthetics global variable.",

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Danke!

Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
},
},
}
}
Expand Down Expand Up @@ -219,6 +225,14 @@ func buildSyntheticsGlobalVariableStruct(d *schema.ResourceData) *datadogV1.Synt
}
}

if restrictedRolesSet, ok := d.GetOk("restricted_roles"); ok {
restrictedRoles := buildDatadogRestrictedRoles(restrictedRolesSet.(*schema.Set))
attributes := datadogV1.SyntheticsGlobalVariableAttributes{
RestrictedRoles: restrictedRoles,
}
syntheticsGlobalVariable.SetAttributes(attributes)
}

return syntheticsGlobalVariable
}

Expand Down Expand Up @@ -264,5 +278,12 @@ func updateSyntheticsGlobalVariableLocalState(d *schema.ResourceData, synthetics
d.Set("parse_test_options", []map[string]interface{}{localParseTestOptions})
}

if syntheticsGlobalVariable.HasAttributes() {
attributes := syntheticsGlobalVariable.GetAttributes()
variableRestrictedRoles := attributes.GetRestrictedRoles()
restrictedRoles := buildTerraformRestrictedRoles(&variableRestrictedRoles)
d.Set("restricted_roles", restrictedRoles)
}

return nil
}
2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogSyntheticsGlobalVariable_Basic.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021-04-20T10:53:40.722265-04:00
2021-08-19T14:09:10.609931+02:00
289 changes: 213 additions & 76 deletions datadog/tests/cassettes/TestAccDatadogSyntheticsGlobalVariable_Basic.yaml
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 17 additions & 4 deletions datadog/tests/resource_datadog_synthetics_global_variable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func TestAccDatadogSyntheticsGlobalVariable_importBasic(t *testing.T) {
t.Parallel()
ctx, accProviders := testAccProviders(context.Background(), t)
variableName := getUniqueVariableName(ctx, t)
roleName := uniqueEntityName(ctx, t)
accProvider := testAccProvider(t, accProviders)

resource.Test(t, resource.TestCase{
Expand All @@ -29,7 +30,7 @@ func TestAccDatadogSyntheticsGlobalVariable_importBasic(t *testing.T) {
CheckDestroy: testSyntheticsResourceIsDestroyed(accProvider),
Steps: []resource.TestStep{
{
Config: createSyntheticsGlobalVariableConfig(variableName),
Config: createSyntheticsGlobalVariableConfig(variableName, roleName),
},
{
ResourceName: "datadog_synthetics_global_variable.foo",
Expand Down Expand Up @@ -119,8 +120,9 @@ func TestAccDatadogSyntheticsGlobalVariableFromTest_Basic(t *testing.T) {

func createSyntheticsGlobalVariableStep(ctx context.Context, accProvider func() (*schema.Provider, error), t *testing.T) resource.TestStep {
variableName := getUniqueVariableName(ctx, t)
roleName := uniqueEntityName(ctx, t)
return resource.TestStep{
Config: createSyntheticsGlobalVariableConfig(variableName),
Config: createSyntheticsGlobalVariableConfig(variableName, roleName),
Check: resource.ComposeTestCheckFunc(
testSyntheticsResourceExists(accProvider),
resource.TestCheckResourceAttr(
Expand All @@ -135,18 +137,25 @@ func createSyntheticsGlobalVariableStep(ctx context.Context, accProvider func()
"datadog_synthetics_global_variable.foo", "tags.1", "baz"),
resource.TestCheckResourceAttr(
"datadog_synthetics_global_variable.foo", "value", "variable-value"),
resource.TestCheckResourceAttr(
"datadog_synthetics_global_variable.foo", "restricted_roles.#", "1"),
),
}
}

func createSyntheticsGlobalVariableConfig(uniq string) string {
func createSyntheticsGlobalVariableConfig(uniqVariableName string, uniqRoleName string) string {
return fmt.Sprintf(`
resource "datadog_role" "rbac_role" {
name = "%s"
}

resource "datadog_synthetics_global_variable" "foo" {
name = "%s"
description = "a global variable"
tags = ["foo:bar", "baz"]
value = "variable-value"
}`, uniq)
restricted_roles = ["${datadog_role.rbac_role.id}"]
}`, uniqRoleName, uniqVariableName)
}

func updateSyntheticsGlobalVariableStep(ctx context.Context, accProvider func() (*schema.Provider, error), t *testing.T) resource.TestStep {
Expand Down Expand Up @@ -373,6 +382,10 @@ func testSyntheticsResourceIsDestroyed(accProvider func() (*schema.Provider, err
authV1 := providerConf.AuthV1

for _, r := range s.RootModule().Resources {
if r.Type == "datadog_role" {
continue
}

if r.Type == "datadog_synthetics_test" {
if _, _, err := datadogClientV1.SyntheticsApi.GetTest(authV1, r.Primary.ID); err != nil {
if strings.Contains(err.Error(), "404 Not Found") {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/terraform-providers/terraform-provider-datadog

require (
github.com/DataDog/datadog-api-client-go v1.2.1-0.20210720115543-0d7c91d1e2e9
github.com/DataDog/datadog-api-client-go v1.2.1-0.20210817160245-b1d86d46e406
github.com/DataDog/datadog-go v3.6.0+incompatible // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/dnaeon/go-vcr v1.0.1
Expand Down
12 changes: 2 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-api-client-go v1.2.1-0.20210720115543-0d7c91d1e2e9 h1:pYdWj4IakelCUbBtaMN9ISD5gx3QBG0gCj+BoQc7rFc=
github.com/DataDog/datadog-api-client-go v1.2.1-0.20210720115543-0d7c91d1e2e9/go.mod h1:QzaQF1cDO1/BIQG1fz14VrY+6RECUGkiwzDCtVbfP5c=
github.com/DataDog/datadog-api-client-go v1.2.1-0.20210817160245-b1d86d46e406 h1:Ts3GF04Y03USj0geEu8bWExDhg0ikP/+czjAPeE2364=
github.com/DataDog/datadog-api-client-go v1.2.1-0.20210817160245-b1d86d46e406/go.mod h1:QzaQF1cDO1/BIQG1fz14VrY+6RECUGkiwzDCtVbfP5c=
github.com/DataDog/datadog-go v3.6.0+incompatible h1:ILg7c5Y1KvZFDOaVS0higGmJ5Fal5O1KQrkrT9j6dSM=
github.com/DataDog/datadog-go v3.6.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/dd-trace-go v1.29.0-alpha.1.0.20210128154316-c84d7933b726 h1:E6y5wxU93et78p5JhD1tl/QDdFofxiSadMJ2p0AqO4Y=
Expand All @@ -58,7 +58,6 @@ github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXva
github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
Expand All @@ -71,7 +70,6 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
github.com/aws/aws-sdk-go v1.25.3 h1:uM16hIw9BotjZKMZlX05SN2EFtaWfi/NonPKIARiBLQ=
Expand Down Expand Up @@ -104,9 +102,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
Expand All @@ -115,7 +111,6 @@ github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI
github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34=
github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8=
github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM=
github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
Expand Down Expand Up @@ -269,7 +264,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
Expand Down Expand Up @@ -315,7 +309,6 @@ github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ=
github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down Expand Up @@ -503,7 +496,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down