diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d438dc91..487a6a73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,6 +34,7 @@ jobs: AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }} AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }} AUTH0_CLIENT_SECRET: ${{ secrets.AUTH0_CLIENT_SECRET }} + DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }} - name: Send code coverage report uses: aktions/codeclimate-test-reporter@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07adefe2..55e28e87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,8 @@ jobs: GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - name: Create release notes - run: scripts/release-notes.sh ${{ env.VERSION }} > release-notes.md + run: | + scripts/release-notes.sh ${{ env.VERSION }} | tee release-notes.md - name: Go release uses: goreleaser/goreleaser-action@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 054ec9fd..ce840533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.25.0 + +ENHANCEMENTS: + +* **New Resource:** `auth0_trigger_binding` a.k.a Action Flow ([#481](https://github.com/alexkappa/terraform-provider-auth0/pull/481)) +* resource/auth0_connection: Add `entity_id` field for SAMLP connections ([#468](https://github.com/alexkappa/terraform-provider-auth0/pull/468)) +* resource/auth0_client_grant: Update import documentation ([#471](https://github.com/alexkappa/terraform-provider-auth0/pull/471)) + ## 0.24.3 BUG FIXES: diff --git a/auth0/resource_auth0_connection.go b/auth0/resource_auth0_connection.go index 6c15689f..5ea7de3b 100644 --- a/auth0/resource_auth0_connection.go +++ b/auth0/resource_auth0_connection.go @@ -588,6 +588,11 @@ var connectionSchema = map[string]*schema.Schema{ Optional: true, Description: "Sign Request Algorithm Digest", }, + "entity_id": { + Type: schema.TypeString, + Optional: true, + Description: "Custom Entity ID for the connection", + }, }, }, Description: "Configuration settings for connection options", diff --git a/auth0/resource_auth0_connection_test.go b/auth0/resource_auth0_connection_test.go index e2ef52ae..d5041d4e 100644 --- a/auth0/resource_auth0_connection_test.go +++ b/auth0/resource_auth0_connection_test.go @@ -1290,6 +1290,7 @@ func TestAccConnectionSAML(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.idp_initiated.0.client_authorize_query", "type=code&timeout=60"), resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.sign_out_endpoint", ""), + resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.entity_id", "example"), ), }, }, @@ -1388,6 +1389,7 @@ EOF protocol_binding = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Post" signature_algorithm = "rsa-sha256" digest_algorithm = "sha256" + entity_id = "example" fields_map = { foo = "bar" baz = "baa" diff --git a/auth0/structure_auth0_connection.go b/auth0/structure_auth0_connection.go index 40eec23a..237d6481 100644 --- a/auth0/structure_auth0_connection.go +++ b/auth0/structure_auth0_connection.go @@ -287,6 +287,7 @@ func flattenConnectionOptionsSAML(o *management.ConnectionOptionsSAML) interface "user_id_attribute": o.GetUserIDAttribute(), "set_user_root_attributes": o.GetSetUserAttributes(), "non_persistent_attrs": o.GetNonPersistentAttrs(), + "entity_id": o.GetEntityID(), } } @@ -669,6 +670,7 @@ func expandConnectionOptionsSAML(d ResourceData) *management.ConnectionOptionsSA LogoURL: String(d, "icon_url"), SetUserAttributes: String(d, "set_user_root_attributes"), NonPersistentAttrs: castToListOfStrings(Set(d, "non_persistent_attrs").List()), + EntityID: String(d, "entity_id"), } List(d, "idp_initiated").Elem(func(d ResourceData) { diff --git a/docs/resources/client_grant.md b/docs/resources/client_grant.md index d589663f..ebe98ac2 100644 --- a/docs/resources/client_grant.md +++ b/docs/resources/client_grant.md @@ -45,3 +45,11 @@ Arguments accepted by this resource include: * `client_id` - (Required) String. ID of the client for this grant. * `audience` - (Required) String. Audience or API Identifier for this grant. * `scope` - (Required) List(String). Permissions (scopes) included in this grant. + +## Import + +Client grants can be imported using the grant ID (Application -> APIs -> Expand the required API) + +``` +$ terraform import auth0_client_grant.example cgr_XXXXXXXXXXXXXXXX +``` diff --git a/docs/resources/connection.md b/docs/resources/connection.md index e3120521..45885563 100644 --- a/docs/resources/connection.md +++ b/docs/resources/connection.md @@ -411,6 +411,7 @@ With the `samlp` connection strategy, `options` supports the following arguments * `user_id_attribute` - (Optional) Attribute in the SAML token that will be mapped to the user_id property in Auth0. * `set_user_root_attributes` - (Optional) Determines whether the 'name', 'given_name', 'family_name', 'nickname', and 'picture' attributes can be independently updated when using the external IdP. Default is `on_each_login` and can be set to `on_first_login`. * `non_persistent_attrs` - (Optional) If there are user fields that should not be stored in Auth0 databases due to privacy reasons, you can add them to the denylist. See [here](https://auth0.com/docs/security/denylist-user-attributes) for more info. +* `entity_id` - (Optional) Custom Entity ID for the connection. **Example**: ```hcl