From 0df8e491eb32b31491fbbe3eee0d2f750be2225d Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Tue, 8 Aug 2023 15:10:15 +0200 Subject: [PATCH 01/10] fix goreleaser --- .github/workflows/release.yml | 2 +- .goreleaser.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 177d473..130a913 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: push: # run only against tags tags: - - 'v[0-9]+.[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+' permissions: contents: write diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 66ac9b6..b850288 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -53,7 +53,7 @@ release: # If you want to manually examine the release before its live, uncomment this line: # draft: true snapshot: - name_template: "{{ .Tag }}-next" + name_template: "v{{ .Tag }}-next" changelog: skip: true gomod: @@ -81,7 +81,7 @@ gomod: announce: teams: enabled: false - title_template: 'Terraform Provider csd {{ .Tag }} was just released!' - message_template: 'Awesome terraform provider {{.Tag}} is out!' + title_template: 'Terraform Provider csd v{{ .Tag }} was just released!' + message_template: 'Awesome terraform provider v{{.Tag}} is out!' color: '#2D313E' #icon_url: 'https://csd.aws.idealo.cloud/avatar.png' From 629b6d8c99f61d9c0452f1c80c21786958c2f760 Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Tue, 8 Aug 2023 15:17:28 +0200 Subject: [PATCH 02/10] Update .goreleaser.yaml Signed-off-by: Ricardo Band --- .goreleaser.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b850288..e5f2288 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -25,7 +25,6 @@ builds: archives: - format: zip name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" - rlcp: true files: - README.md checksum: From 24040aab5ce0909b27e4d1c85baadcce0ae18863 Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Wed, 9 Aug 2023 12:25:05 +0200 Subject: [PATCH 03/10] fix quotes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fd4bbb..32060aa 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Online documentation can also be found [here](https://registry.terraform.io/prov ## Upgrade from v1.x to v2.x -1. Comment all old "csd_zone" resources +1. Comment all old `csd_zone` resources 2. Run `terraform apply`, this will delete your old zone delegation 3. Update provider version to `~>2.0` 4. Uncomment and rename old `csd_zone` resources to `csd_zone_delegation` From 465b4dbfa24bba69e8cd529dc05a6ae7c123faa7 Mon Sep 17 00:00:00 2001 From: odilo <2466850+odilo@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:31:44 +0200 Subject: [PATCH 04/10] Fix type in README.md Signed-off-by: odilo <2466850+odilo@users.noreply.github.com> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 32060aa..47c359a 100644 --- a/README.md +++ b/README.md @@ -144,14 +144,14 @@ resource "csd_zone_delegation" "shopverwaltung" { ```terraform resource "csd_record" "wishlist_idealo_de_cname" { name = "wishlist.idealo.de" - type = "cname" + rrtype = "cname" value = "wishlist.edgekey.net" ttl = 3600 } resource "csd_record" "_acme_challenge_wishlist_idealo_de_txt" { name = "_acme_challenge.wishlist.idealo.de" - type = "txt" + rrtype = "txt" value = "LeisahxaiQu8ayah2aiwe9Que5saiy4o" ttl = 60 } From 1131a4d4134c1ee83518609cd3ec303846ba3268 Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Thu, 24 Aug 2023 10:39:55 +0200 Subject: [PATCH 05/10] Update README.md Signed-off-by: Ricardo Band --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 47c359a..e13bc17 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ terraform { } ``` -Now follow the proper upgrade procedure described [here](#Upgrade from v1.x to v2.x). +Now follow the proper upgrade procedure described [here](https://github.com/idealo/terraform-provider-csd/tree/main#upgrade-from-v1x-to-v2x). # Development From e178b7a9739376a9d9e537293fe43e2e3e04ddbc Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Thu, 31 Aug 2023 11:45:38 +0200 Subject: [PATCH 06/10] Update README.md Signed-off-by: Ricardo Band --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e13bc17..99b0c55 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ resource "csd_record" "_acme_challenge_wishlist_idealo_de_txt" { } ``` -Follow the detailed documentation on how to setup the Akamai property [here](https://backstage.idealo.tools/catalog/default/component/CSD/docs/#use-case-forward-traffic-to-akamai). If you have any questions about the property, please ask the [SECURITY](https://teams.microsoft.com/l/channel/19%3a77eca9f9ee784e04988b4b8c29814e0b%40thread.tacv2/%25F0%259F%259B%25A1%25EF%25B8%258F%2520PT%2520Security?groupId=424df2ed-7bad-42b5-9c93-2a74f5acd0e1&tenantId=21956b19-fed2-44b7-90cf-b6d281c0a42a) team. They will gladly help you with that. +Follow the detailed documentation on how to setup the Akamai property [here](https://backstage.idealo.tools/catalog/default/component/CSD/docs/#use-case-forward-traffic-to-akamai). If you have any security related questions about the property, please ask the [SECURITY](https://teams.microsoft.com/l/channel/19%3a77eca9f9ee784e04988b4b8c29814e0b%40thread.tacv2/%25F0%259F%259B%25A1%25EF%25B8%258F%2520PT%2520Security?groupId=424df2ed-7bad-42b5-9c93-2a74f5acd0e1&tenantId=21956b19-fed2-44b7-90cf-b6d281c0a42a) team. They will gladly help you with that. If you have questions regarding bot detection, the [User Insights](https://teams.microsoft.com/l/channel/19%3a4ae895491b724ee08b6cfd54d6ea1ca3%40thread.tacv2/User%2520Insights%2520-%2520General?groupId=424df2ed-7bad-42b5-9c93-2a74f5acd0e1&tenantId=21956b19-fed2-44b7-90cf-b6d281c0a42a) team might help too. For anything else you can ask the [Transport](https://teams.microsoft.com/l/channel/19%3a3038b820be2e4194905c35f5f98b8ceb%40thread.tacv2/%25E2%2598%2581%25EF%25B8%258F%2520PT%2520Web%2520Platform?groupId=424df2ed-7bad-42b5-9c93-2a74f5acd0e1&tenantId=21956b19-fed2-44b7-90cf-b6d281c0a42a) team. # FAQ From e64f596ef23e89c5e8ba74b30b1845d9c48b1bd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:50:25 +0000 Subject: [PATCH 07/10] Bump golang.org/x/net from 0.11.0 to 0.17.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.11.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.11.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 901cfae..76b8a2f 100644 --- a/go.mod +++ b/go.mod @@ -71,12 +71,12 @@ require ( github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zclconf/go-cty v1.13.2 // indirect - golang.org/x/crypto v0.10.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.11.0 // indirect - golang.org/x/sys v0.9.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/grpc v1.56.0 // indirect diff --git a/go.sum b/go.sum index 20121f1..1129dfd 100644 --- a/go.sum +++ b/go.sum @@ -209,8 +209,8 @@ golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -222,8 +222,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= -golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -241,8 +241,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -251,8 +251,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From 00ea496dfa5f2064c6c5a604d6baa6cf18f12902 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:07:17 +0000 Subject: [PATCH 08/10] Bump google.golang.org/grpc from 1.56.0 to 1.56.3 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.56.0 to 1.56.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.56.0...v1.56.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 76b8a2f..856fe86 100644 --- a/go.mod +++ b/go.mod @@ -79,6 +79,6 @@ require ( golang.org/x/text v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.0 // indirect + google.golang.org/grpc v1.56.3 // indirect google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/go.sum b/go.sum index 1129dfd..6422d76 100644 --- a/go.sum +++ b/go.sum @@ -263,8 +263,8 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE= -google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= From 8012bd4c8204031aa81f55dfbeeb357123d26583 Mon Sep 17 00:00:00 2001 From: Odilo Durchschlag Date: Mon, 20 Nov 2023 15:48:05 +0100 Subject: [PATCH 09/10] Remove disclaimer and disclosures of internals --- README.md | 61 +++++-------------- examples/data-sources/csd_zone/data-source.tf | 2 +- examples/main.tf | 14 ++--- examples/resources/csd_zone/import.sh | 2 +- examples/resources/csd_zone/resource.tf | 2 +- 5 files changed, 24 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 99b0c55..07dea9c 100644 --- a/README.md +++ b/README.md @@ -4,44 +4,8 @@ The Common Short Domain product gives you cool short domains (AWS Hosted Zones) in your AWS account so you can manage them yourself, without the hassle of a third party. -Currently, we support the following domains where you can get subdomains: - -- `idealo.tools`: internal idealo tooling for everyone -- `idealo.com`: idealo components mostly for b2b -- `idealo.de`: idealo components mostly for b2c -- `idealo.co.uk`: idealo components mostly for british b2c -- `idealo.es`: idealo components mostly for spanish b2c -- `idealo.fr`: idealo components mostly for french b2c -- `idealo.it`: idealo components mostly for italian b2c -- `idealo.nl`: idealo components mostly for dutch b2c -- `idealo.pl`: idealo components mostly for polish b2c -- `idealo.pt`: idealo components mostly for portuguese b2c - -More domains will follow in future updates. If you're missing one that you need, contact Team Transport. - _Keep in mind that your FQDN shouldn't exceed 64 characters (including the final dot) to retrieve a TLS certificate._ -# ⚠️ Disclaimer - -> With great power comes great responsibility. - -Owning your own zone under an idealo.TLD comes with some responsibilities. - -## Cookies - -Customers log into idealo.de and other idealo TLDs with a cookie that is valid for that domain and its subdomains which includes your hosted zone. This could lead to some unwanted site effects you must be aware of. For example, if you create a CNAME pointing to an external FQDN, the cookie will be readable by that third party. So this external service provider could read that cookie and in the worst case impersonate our customer. From a security perspective, this might be unwanted behaviour. So if you point DNS records to third parties, take care that cookies are not forwarded to them. If you're unsure please contact us or the Security team to clarify how to deal with your specific scenario. - -As an example, let's say you serve the wishlist component from you AWS account. For that, you registered the subdomain wishlist.idealo.de with our CSD product. That means that we delegate the zone wishlist.idealo.de to your account. In your account, you then create DNS resource records pointing to the wishlist component, for example an ALB inside your account. -Imagine you use a third party service like Salesforce that requires you to point DNS entries under your hosted zone to their service. For example, a CNAME salesforce.wishlist.idealo.de pointing to service.salesforce.com. This would mean that Salesforce is now able to read the customer's cookie and therefore is able to impersonate that customer. In that case, contact security to make sure that you comply with our security requirements. - -## Mail servers - -By controlling your own zone, you're also able to set records for your own mail servers. These mail servers would be able to send mails with a sender under subdomain for example wishlist.idealo.de. These mails should be well crafted and aligned with company standards from the design, legal and security departments. - -If you plan to set up email communication under your subdomain, you must talk to the mentioned departments first to make you follow the idealo guidelines. - -If you have any other questions about your hosted zone setup, feel free to reach out to Team Transport. - # Installation ## Install from Terraform Registry @@ -122,18 +86,21 @@ module "terraform_execution_role" { ```terraform # Create a Route53 Hosted Zone. +# sample-app is a placeholder for the subdomain for your application. +# example.net is a placeholder for a domain which is supported in the CSD product. # The lifecycle option prevents Terraform from accidentally removing critical resources. -resource "aws_route53_zone" "shopverwaltung" { - name = "shopverwaltung.idealo.tools" +resource "aws_route53_zone" "sample-app" { + name = "sample-app.example.net" lifecycle { prevent_destroy = true } } -# Create zone delegation in idealo.tools zone via CSD provider -resource "csd_zone_delegation" "shopverwaltung" { - name = aws_route53_zone.shopverwaltung.name - name_servers = aws_route53_zone.shopverwaltung.name_servers +# Create zone delegation in example.net zone via CSD provider +# example.net is a placeholder for a domain which is supported in the CSD product. +resource "csd_zone_delegation" "sample-app" { + name = aws_route53_zone.sample-app.name + name_servers = aws_route53_zone.sample-app.name_servers } ``` @@ -142,15 +109,15 @@ resource "csd_zone_delegation" "shopverwaltung" { ## Use case 2: Route traffic through Akamai ```terraform -resource "csd_record" "wishlist_idealo_de_cname" { - name = "wishlist.idealo.de" +resource "csd_record" "sample-app_example_net_cname" { + name = "sample-app.example.net" rrtype = "cname" - value = "wishlist.edgekey.net" + value = "sample-app.edgekey.net" ttl = 3600 } -resource "csd_record" "_acme_challenge_wishlist_idealo_de_txt" { - name = "_acme_challenge.wishlist.idealo.de" +resource "csd_record" "_acme_challenge_sample-app_example_net_txt" { + name = "_acme_challenge.sample-app.example.net" rrtype = "txt" value = "LeisahxaiQu8ayah2aiwe9Que5saiy4o" ttl = 60 diff --git a/examples/data-sources/csd_zone/data-source.tf b/examples/data-sources/csd_zone/data-source.tf index d04b396..75b7e8f 100644 --- a/examples/data-sources/csd_zone/data-source.tf +++ b/examples/data-sources/csd_zone/data-source.tf @@ -1,3 +1,3 @@ data "csd_zone_delegation" "my_zone_delegation" { - name = "myzone.idealo.tools" + name = "myzone.example.net" } diff --git a/examples/main.tf b/examples/main.tf index 082e6f0..37f4f4f 100644 --- a/examples/main.tf +++ b/examples/main.tf @@ -15,13 +15,13 @@ terraform { provider "aws" { region = "eu-central-1" - allowed_account_ids = ["433744410943"] + allowed_account_ids = ["123456789012"] } provider "csd" {} resource "aws_route53_zone" "myzone" { - name = "myzone2.idealo.tools" + name = "myzone2.example.net" } resource "csd_zone_delegation" "myzone" { @@ -38,19 +38,19 @@ resource "aws_route53_record" "myrecord" { } resource "csd_record" "myrecord" { - name = "_acme-challenge.myrecord.myzone2.idealo.tools" + name = "_acme-challenge.myrecord.myzone2.example.net" rrtype = "TXT" value = "foobar" } resource "csd_record" "myrecord2" { - name = "myrecord2.myzone2.idealo.tools" + name = "myrecord2.myzone2.example.net" rrtype = "CNAME" value = "foobar.edgekey.net." } #data "csd_record" "myrecord" { -# name = "myrecord.idealo.tools" +# name = "myrecord.example.net" #} #output "myrecord" { @@ -64,7 +64,7 @@ resource "csd_record" "myrecord2" { #} #resource "aws_route53_zone" "my_zone" { -# name = "myzone.idealo.tools" +# name = "myzone.example.net" #} #resource "csd_zone_delegation" "my_zone_delegation" { @@ -87,7 +87,7 @@ resource "csd_record" "myrecord2" { #} #data "csd_zone_delegation" "my_zone_delegation" { -# name = "myzone.idealo.tools" +# name = "myzone.example.net" #} #output "test_data_read_zone_delegation" { diff --git a/examples/resources/csd_zone/import.sh b/examples/resources/csd_zone/import.sh index 5e81d5b..35110d6 100644 --- a/examples/resources/csd_zone/import.sh +++ b/examples/resources/csd_zone/import.sh @@ -1 +1 @@ -terraform import csd_zone_delegation.example myzone.idealo.tools +terraform import csd_zone_delegation.example myzone.example.net diff --git a/examples/resources/csd_zone/resource.tf b/examples/resources/csd_zone/resource.tf index ef8340d..b7464e6 100644 --- a/examples/resources/csd_zone/resource.tf +++ b/examples/resources/csd_zone/resource.tf @@ -1,5 +1,5 @@ resource "aws_route53_zone" "my_zone" { - name = "myzone.idealo.tools" + name = "myzone.example.net" } resource "csd_zone_delegation" "my_zone_delegation" { From 3e23ec0b6fccc945d9c4b243afed82776854354d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:48:31 +0000 Subject: [PATCH 10/10] Bump github.com/cloudflare/circl from 1.3.3 to 1.3.7 Bumps [github.com/cloudflare/circl](https://github.com/cloudflare/circl) from 1.3.3 to 1.3.7. - [Release notes](https://github.com/cloudflare/circl/releases) - [Commits](https://github.com/cloudflare/circl/compare/v1.3.3...v1.3.7) --- updated-dependencies: - dependency-name: github.com/cloudflare/circl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 856fe86..96146ff 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.21.1 // indirect github.com/aws/smithy-go v1.14.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/cloudflare/circl v1.3.3 // indirect + github.com/cloudflare/circl v1.3.7 // indirect github.com/fatih/color v1.14.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect @@ -71,12 +71,12 @@ require ( github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zclconf/go-cty v1.13.2 // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/grpc v1.56.3 // indirect diff --git a/go.sum b/go.sum index 6422d76..b1e3365 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= -github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= -github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= +github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -209,8 +209,8 @@ golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -241,8 +241,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -251,8 +251,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=