diff --git a/.github/workflows/canister-tests.yml b/.github/workflows/canister-tests.yml index 479d49c2a8..70cb0f3ce6 100644 --- a/.github/workflows/canister-tests.yml +++ b/.github/workflows/canister-tests.yml @@ -891,27 +891,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - # we need the history for the tags, but we don't need the files (except for the GitHub workflows / actions) - # --> sparse checkout of only the needed things - fetch-depth: 0 - sparse-checkout: | - src/internet_identity/internet_identity.did - .github - .didc-release - allowed_breaking_change.patch - sparse-checkout-cone-mode: false - uses: ./.github/actions/setup-didc - name: "Check canister interface compatibility" run: | - release="release-2023-12-15" - # undo the breaking changes that we _explicitly_ made - # remove after the next release - # if we accidentally introduced other breaking changes, the patch would no longer apply / fix them - # making this job fail. - if [ "$(git describe --tags --match="release-[0-9-]*" HEAD --abbrev=0)" == "$release" ]; then - echo "Rolling back intentionally made breaking changes $release" - git apply allowed_breaking_change.patch - fi curl -sSL https://github.com/dfinity/internet-identity/releases/latest/download/internet_identity.did -o internet_identity_previous.did didc check src/internet_identity/internet_identity.did internet_identity_previous.did diff --git a/allowed_breaking_change.patch b/allowed_breaking_change.patch deleted file mode 100644 index 1f426aa110..0000000000 --- a/allowed_breaking_change.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/src/internet_identity/internet_identity.did b/src/internet_identity/internet_identity.did -index c1bf6d34..60bd6b90 100644 ---- a/src/internet_identity/internet_identity.did -+++ b/src/internet_identity/internet_identity.did -@@ -320,21 +320,21 @@ type PublicKeyAuthn = record { - - // The authentication methods currently supported by II. - type AuthnMethod = variant { -- WebAuthn: WebAuthn; -- PubKey: PublicKeyAuthn; -+ webauthn: WebAuthn; -+ pubkey: PublicKeyAuthn; - }; - - // This describes whether an authentication method is "protected" or not. - // When protected, a authentication method can only be updated or removed if the - // user is authenticated with that very authentication method. - type AuthnMethodProtection = variant { -- Protected; -- Unprotected; -+ protected; -+ unprotected; - }; - - type AuthnMethodPurpose = variant { -- Recovery; -- Authentication; -+ recovery; -+ authentication; - }; - - type AuthnMethodSecuritySettings = record { -@@ -344,7 +344,8 @@ type AuthnMethodSecuritySettings = record { - - type AuthnMethodData = record { - authn_method: AuthnMethod; -- security_settings: AuthnMethodSecuritySettings; -+ protection: AuthnMethodProtection; -+ purpose: AuthnMethodPurpose; - // contains the following fields of the DeviceWithUsage type: - // - alias - // - origin -@@ -352,7 +353,7 @@ type AuthnMethodData = record { - // - usage: data taken from key_type and reduced to "recovery_phrase", "browser_storage_key" or absent on migration - // Note: for compatibility reasons with the v1 API, the entries above (if present) - // must be of the `String` variant. This restriction may be lifted in the future. -- metadata: MetadataMapV2; -+ metadata: MetadataMap; - last_authentication: opt Timestamp; - }; - -@@ -433,8 +434,8 @@ type PrepareIdAliasRequest = record { - }; - - type PrepareIdAliasError = variant { -- /// The caller is not authorized to call this method with the given arguments. -- Unauthorized; -+ /// Caller authentication failed. -+ AuthenticationFailed : text; - }; - - /// The prepared id alias contains two (still unsigned) credentials in JWT format, -@@ -457,8 +458,8 @@ type GetIdAliasRequest = record { - }; - - type GetIdAliasError = variant { -- /// The caller is not authorized to call this method with the given arguments. -- Unauthorized; -+ /// Caller authentication failed. -+ AuthenticationFailed : text; - /// The credential(s) are not available: may be expired or not prepared yet (call prepare_id_alias to prepare). - NoSuchCredentials : text; - }; -@@ -534,7 +535,7 @@ service : (opt InternetIdentityInit) -> { - // Replaces the authentication method independent metadata map. - // The existing metadata map will be overwritten. - // Requires authentication. -- identity_metadata_replace: (IdentityNumber, MetadataMapV2) -> (variant {Ok; Err;}); -+ identity_metadata_replace: (IdentityNumber, MetadataMap) -> (variant {Ok; Err;}); - - // Adds a new authentication method to the identity. - // Requires authentication.