.eslintignore

@@ -1,3 +0,0 @@
-/dist/**
-/coverage/**
-/node_modules/**

.eslintrc.json

@@ -1,24 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "es6": true,
-    "jest": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:jest/recommended",
-    "plugin:prettier/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  },
-  "plugins": [
-    "@typescript-eslint",
-    "jest",
-    "prettier"
-  ]
-}

.github/CODEOWNERS

@@ -0,0 +1 @@
+*	@crazy-max

.github/CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Code of conduct
-
-- [Moby community guidelines](https://github.com/moby/moby/blob/master/CONTRIBUTING.md#moby-community-guidelines)

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,101 +0,0 @@
-# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
-name: Bug Report
-description: Report a bug
-labels:
-  - status/triage
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to report a bug!
-        If this is a security issue please report it to the [Docker Security team](mailto:security@docker.com).
-
-  - type: checkboxes
-    attributes:
-      label: Contributing guidelines
-      description: >
-        Make sure you've read the contributing guidelines before proceeding.
-      options:
-        - label: I've read the [contributing guidelines](https://github.com/docker/login-action/blob/master/.github/CONTRIBUTING.md) and wholeheartedly agree
-          required: true
-
-  - type: checkboxes
-    attributes:
-      label: "I've found a bug, and:"
-      description: |
-        Make sure that your request fulfills all of the following requirements.
-        If one requirement cannot be satisfied, explain in detail why.
-      options:
-        - label: The documentation does not mention anything about my problem
-        - label: There are no open or closed issues that are related to my problem
-
-  - type: textarea
-    attributes:
-      label: Description
-      description: >
-        Provide a brief description of the bug in 1-2 sentences.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected behaviour
-      description: >
-        Describe precisely what you'd expect to happen.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Actual behaviour
-      description: >
-        Describe precisely what is actually happening.
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Repository URL
-      description: >
-        Enter the URL of the repository where you are experiencing the
-        issue. If your repository is private, provide a link to a minimal
-        repository that reproduces the issue.
-
-  - type: input
-    attributes:
-      label: Workflow run URL
-      description: >
-        Enter the URL of the GitHub Action workflow run if public (e.g.
-        `https://github.com/<user>/<repo>/actions/runs/<id>`)
-
-  - type: textarea
-    attributes:
-      label: YAML workflow
-      description: |
-        Provide the YAML of the workflow that's causing the issue.
-        Make sure to remove any sensitive information.
-      render: yaml
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Workflow logs
-      description: >
-        [Attach](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files)
-        the [log file of your workflow run](https://docs.github.com/en/actions/managing-workflow-runs/using-workflow-run-logs#downloading-logs)
-        and make sure to remove any sensitive information.
-
-  - type: textarea
-    attributes:
-      label: BuildKit logs
-      description: >
-        If applicable, provide the [BuildKit container logs](https://docs.docker.com/build/ci/github-actions/configure-builder/#buildkit-container-logs)
-      render: text
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: |
-        Provide any additional information that could be useful.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+### Behaviour
+
+#### Steps to reproduce this issue
+
+1.
+2.
+3.
+
+#### Expected behaviour
+
+> Tell us what should happen
+
+#### Actual behaviour
+
+> Tell us what happens instead
+
+### Configuration
+
+* Repository URL (if public): 
+* Build URL (if public): 
+
+```yml
+# paste your YAML workflow file here and remove sensitive data
+```
+
+### Logs
+
+> Download the [log file of your build](https://docs.github.com/en/actions/managing-workflow-runs/using-workflow-run-logs#downloading-logs)
+> and [attach it](https://docs.github.com/en/github/managing-your-work-on-github/file-attachments-on-issues-and-pull-requests) to this issue.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +0,0 @@
-# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
-blank_issues_enabled: true
-contact_links:
-  - name: Questions and Discussions
-    url: https://github.com/docker/login-action/discussions/new
-    about: Use Github Discussions to ask questions and/or open discussion topics.
-  - name: Documentation
-    url: https://docs.docker.com/build/ci/github-actions/
-    about: Read the documentation.

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,15 +0,0 @@
-# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
-name: Feature request
-description: Missing functionality? Come tell us about it!
-labels:
-  - kind/enhancement
-  - status/triage
-
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: What is the feature you want to see?
-    validations:
-      required: true

.github/SECURITY.md

@@ -1,12 +0,0 @@
-# Reporting security issues
-
-The project maintainers take security seriously. If you discover a security
-issue, please bring it to their attention right away!
-
-**Please _DO NOT_ file a public issue**, instead send your report privately to
-[security@docker.com](mailto:security@docker.com).
-
-Security reports are greatly appreciated, and we will publicly thank you for it.
-We also like to send gifts—if you'd like Docker swag, make sure to let
-us know. We currently do not offer a paid security bounty program, but are not
-ruling it out in the future.

.github/SUPPORT.md

@@ -0,0 +1,29 @@
+# Support [![](https://isitmaintained.com/badge/resolution/docker/login-action.svg)](https://isitmaintained.com/project/docker/login-action)
+
+## Reporting an issue
+
+Please do a search in [open issues](https://github.com/docker/login-action/issues?utf8=%E2%9C%93&q=) to see if the issue or feature request has already been filed.
+
+If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.
+
+:+1: - upvote
+
+:-1: - downvote
+
+If you cannot find an existing issue that describes your bug or feature, submit an issue using the guidelines below.
+
+## Writing good bug reports and feature requests
+
+File a single issue per problem and feature request.
+
+* Do not enumerate multiple bugs or feature requests in the same issue.
+* Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.
+
+The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
+
+You are now ready to [create a new issue](https://github.com/docker/login-action/issues/new/choose)!
+
+## Closure policy
+
+* Issues that don't have the information requested above (when applicable) will be closed immediately and the poster directed to the support guidelines.
+* Issues that go a week without a response from original poster are subject to closure at our discretion.

.github/dependabot.yml

@@ -5,22 +5,14 @@ updates:
     schedule:
       interval: "daily"
     labels:
-      - "dependencies"
+      - ":game_die: dependencies"
-      - "bot"
+      - ":robot: bot"
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
       interval: "daily"
-    versioning-strategy: "increase"
-    groups:
-      aws-sdk-dependencies:
-        patterns:
-          - "*aws-sdk*"
-      proxy-agent-dependencies:
-        patterns:
-          - "*-proxy-agent"
     allow:
       - dependency-type: "production"
     labels:
-      - "dependencies"
+      - ":game_die: dependencies"
-      - "bot"
+      - ":robot: bot"

.github/workflows/ci.yml

@@ -1,13 +1,9 @@
 name: ci
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 10 * * *'
+    - cron: '0 10 * * *' # everyday at 10am
   push:
     branches:
       - 'master'
@@ -19,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Stop docker
         run: |
@@ -29,7 +25,7 @@ jobs:
         uses: ./
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
   logout:
@@ -43,13 +39,13 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to GitHub Container Registry
         uses: ./
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
           logout: ${{ matrix.logout }}
 
@@ -60,7 +56,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to GitHub Container Registry
         uses: ./
@@ -80,32 +76,19 @@ jobs:
           docker image prune -a -f >/dev/null 2>&1
           docker pull ghcr.io/docker-ghactiontest/test
 
-  acr:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Login to ACR
-        uses: ./
-        with:
-          registry: ${{ secrets.AZURE_REGISTRY_NAME }}.azurecr.io
-          username: ${{ secrets.AZURE_CLIENT_ID }}
-          password: ${{ secrets.AZURE_CLIENT_SECRET }}
-
   dockerhub:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
-          - windows-latest
+          - ubuntu-18.04
+          - ubuntu-16.04
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to Docker Hub
         uses: ./
@@ -119,17 +102,18 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
-          - windows-latest
+          - ubuntu-18.04
+          - ubuntu-16.04
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to ECR
         uses: ./
         with:
-          registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.us-east-1.amazonaws.com
+          registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
@@ -139,24 +123,25 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
-          - windows-latest
+          - ubuntu-18.04
+          - ubuntu-16.04
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
+          aws-region: ${{ secrets.AWS_REGION }}
       -
         name: Login to ECR
         uses: ./
         with:
-          registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.us-east-1.amazonaws.com
+          registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
 
   ecr-public:
     runs-on: ${{ matrix.os }}
@@ -164,81 +149,41 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
-          - windows-latest
+          - ubuntu-18.04
+          - ubuntu-16.04
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to Public ECR
-        continue-on-error: ${{ matrix.os == 'windows-latest' }}
         uses: ./
         with:
           registry: public.ecr.aws
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        env:
-          AWS_REGION: us-east-1
-
-  ecr-public-aws-creds:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-      -
-        name: Login to Public ECR
-        continue-on-error: ${{ matrix.os == 'windows-latest' }}
-        uses: ./
-        with:
-          registry: public.ecr.aws
 
   github-container:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to GitHub Container Registry
         uses: ./
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
   gitlab:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to GitLab
         uses: ./
@@ -248,17 +193,11 @@ jobs:
           password: ${{ secrets.GITLAB_TOKEN }}
 
   google-artifact:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to Google Artifact Registry
         uses: ./
@@ -268,17 +207,11 @@ jobs:
           password: ${{ secrets.GAR_JSON_KEY }}
 
   google-container:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       -
         name: Login to Google Container Registry
         uses: ./

.github/workflows/codeql.yml

@@ -1,50 +0,0 @@
-name: codeql
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'releases/v*'
-    paths:
-      - '.github/workflows/codeql.yml'
-      - 'dist/**'
-      - 'src/**'
-  pull_request:
-    paths:
-      - '.github/workflows/codeql.yml'
-      - 'dist/**'
-      - 'src/**'
-
-permissions:
-  actions: read
-  contents: read
-  security-events: write
-
-jobs:
-  analyze:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        language:
-          - javascript-typescript
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          config: |
-            paths:
-              - src
-      -
-        name: Autobuild
-        uses: github/codeql-action/autobuild@v3
-      -
-        name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
-        with:
-          category: "/language:${{matrix.language}}"

.github/workflows/test.yml

@@ -1,15 +1,14 @@
 name: test
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
       - 'master'
       - 'releases/v*'
   pull_request:
+    branches:
+      - 'master'
+      - 'releases/v*'
 
 jobs:
   test:
@@ -17,15 +16,19 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+      -
+        name: Validate
+        uses: docker/bake-action@v1
+        with:
+          targets: validate
       -
         name: Test
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v1
         with:
           targets: test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v1
         with:
           file: ./coverage/clover.xml
-          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/validate.yml

@@ -1,45 +0,0 @@
-name: validate
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'releases/v*'
-  pull_request:
-
-jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    outputs:
-      targets: ${{ steps.targets.outputs.matrix }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Targets matrix
-        id: targets
-        run: |
-          echo "matrix=$(docker buildx bake validate --print | jq -cr '.group.validate.targets')" >> $GITHUB_OUTPUT
-
-  validate:
-    runs-on: ubuntu-latest
-    needs:
-      - prepare
-    strategy:
-      fail-fast: false
-      matrix:
-        target: ${{ fromJson(needs.prepare.outputs.targets) }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Validate
-        uses: docker/bake-action@v4
-        with:
-          targets: ${{ matrix.target }}

.gitignore

@@ -1,6 +1,11 @@
+/.dev
 node_modules/
 lib
 
+# Jetbrains
+/.idea
+/*.iml
+
 # Rest of the file pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
 # Logs
 logs

.prettierrc.json

@@ -1,5 +1,5 @@
 {
-  "printWidth": 240,
+  "printWidth": 120,
   "tabWidth": 2,
   "useTabs": false,
   "semi": true,

README.md

@@ -1,7 +1,7 @@
 [![GitHub release](https://img.shields.io/github/release/docker/login-action.svg?style=flat-square)](https://github.com/docker/login-action/releases/latest)
 [![GitHub marketplace](https://img.shields.io/badge/marketplace-docker--login-blue?logo=github&style=flat-square)](https://github.com/marketplace/actions/docker-login)
-[![CI workflow](https://img.shields.io/github/actions/workflow/status/docker/login-action/ci.yml?branch=master&label=ci&logo=github&style=flat-square)](https://github.com/docker/login-action/actions?workflow=ci)
+[![CI workflow](https://img.shields.io/github/workflow/status/docker/login-action/ci?label=ci&logo=github&style=flat-square)](https://github.com/docker/login-action/actions?workflow=ci)
-[![Test workflow](https://img.shields.io/github/actions/workflow/status/docker/login-action/test.yml?branch=master&label=test&logo=github&style=flat-square)](https://github.com/docker/login-action/actions?workflow=test)
+[![Test workflow](https://img.shields.io/github/workflow/status/docker/login-action/test?label=test&logo=github&style=flat-square)](https://github.com/docker/login-action/actions?workflow=test)
 [![Codecov](https://img.shields.io/codecov/c/github/docker/login-action?logo=codecov&style=flat-square)](https://codecov.io/gh/docker/login-action)
 
 ## About
@@ -31,16 +31,15 @@ ___
 
 ### Docker Hub
 
-When authenticating to [Docker Hub](https://hub.docker.com) with GitHub Actions,
+To authenticate against [Docker Hub](https://hub.docker.com) it's strongly recommended to create a
-use a [personal access token](https://docs.docker.com/docker-hub/access-tokens/).
+[personal access token](https://docs.docker.com/docker-hub/access-tokens/) as an alternative to your password.
-Don't use your account password.
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -48,7 +47,7 @@ jobs:
     steps:
       -
         name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -56,16 +55,19 @@ jobs:
 
 ### GitHub Container Registry
 
-To authenticate to the [GitHub Container Registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry),
+To use the [GitHub Container Registry](https://docs.github.com/en/packages/getting-started-with-github-container-registry),
-use the [`GITHUB_TOKEN`](https://docs.github.com/en/actions/reference/authentication-in-a-workflow)
+you need to [enable this feature for your personal or organization account](https://docs.github.com/en/packages/guides/enabling-improved-container-support).
-secret.
+
+To [authenticate against it](https://docs.github.com/en/packages/guides/migrating-to-github-container-registry-for-docker-images#authenticating-with-the-container-registry),
+use the [`GITHUB_TOKEN`](https://docs.github.com/en/actions/reference/authentication-in-a-workflow) for the best
+security and experience.
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -73,15 +75,16 @@ jobs:
     steps:
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 ```
 
-You may need to [manage write and read access of GitHub Actions](https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio)
+You may need to manage write and read access of GitHub Actions for repositories in the container settings:
-for repositories in the container settings.
+
+![Manage Actions access](.github/ghcr-manage-actions-access.gif)
 
 You can also use a [personal access token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token)
 with the [appropriate scopes](https://docs.github.com/en/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images#authenticating-with-the-container-registry).
@@ -93,7 +96,7 @@ name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -101,30 +104,25 @@ jobs:
     steps:
       -
         name: Login to GitLab
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: registry.gitlab.com
           username: ${{ secrets.GITLAB_USERNAME }}
           password: ${{ secrets.GITLAB_PASSWORD }}
 ```
 
-If you have [Two-Factor Authentication](https://gitlab.com/help/user/profile/account/two_factor_authentication)
-enabled, use a [Personal Access Token](https://gitlab.com/help/user/profile/personal_access_tokens)
-instead of a password.
-
 ### Azure Container Registry (ACR)
 
 [Create a service principal](https://docs.microsoft.com/en-us/azure/container-registry/container-registry-auth-service-principal#create-a-service-principal)
 with access to your container registry through the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
-and take note of the generated service principal's ID (also called _client ID_)
+and take note of the generated service principal's ID (also called _client ID_) and password (also called _client secret_).
-and password (also called _client secret_).
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -132,7 +130,7 @@ jobs:
     steps:
       -
         name: Login to ACR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: <registry-name>.azurecr.io
           username: ${{ secrets.AZURE_CLIENT_ID }}
@@ -143,70 +141,22 @@ jobs:
 
 ### Google Container Registry (GCR)
 
-> [Google Artifact Registry](#google-artifact-registry-gar) is the evolution of
+> [Google Artifact Registry](#google-artifact-registry-gar) is the evolution of Google Container Registry. As a
-> Google Container Registry. As a fully-managed service with support for both
+> fully-managed service with support for both container images and non-container artifacts. If you currently use
-> container images and non-container artifacts. If you currently use Google
+> Google Container Registry, use the information [on this page](https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr)
-> Container Registry, use the information [on this page](https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr)
 > to learn about transitioning to Google Artifact Registry. 
 
-You can authenticate with workload identity federation or a service account.
+Use a service account with the ability to push to GCR and [configure access control](https://cloud.google.com/container-registry/docs/access-control).
-
+Then create and download the JSON key for this service account and save content of `.json` file
-#### Workload identity federation
+[as a secret](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
-
+called `GCR_JSON_KEY` in your GitHub repo. Ensure you set the username to `_json_key`.
-Configure the workload identity federation for GitHub Actions in Google Cloud,
-[see here](https://github.com/google-github-actions/auth#setting-up-workload-identity-federation).
-Your service account must have permission to push to GCR. Use the
-`google-github-actions/auth` action to authenticate using workload identity as
-shown in the following example:
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
-
-jobs:
-  login:
-    runs-on: ubuntu-latest
-    steps:
-    -
-      name: Authenticate to Google Cloud
-      id: auth
-      uses: google-github-actions/auth@v1
-      with:
-        token_format: access_token
-        workload_identity_provider: <workload_identity_provider>
-        service_account: <service_account>
-    -
-      name: Login to GCR
-      uses: docker/login-action@v3
-      with:
-        registry: gcr.io
-        username: oauth2accesstoken
-        password: ${{ steps.auth.outputs.access_token }}
-```
-
-> Replace `<workload_identity_provider>` with configured workload identity
-> provider. For steps to configure, [see here](https://github.com/google-github-actions/auth#setting-up-workload-identity-federation).
-
-> Replace `<service_account>` with configured service account in workload
-> identity provider which has access to push to GCR
-
-#### Service account based authentication
-
-Use a service account with permission to push to GCR and [configure access control](https://cloud.google.com/container-registry/docs/access-control).
-Download the key for the service account as a JSON file. Save the contents of
-the file [as a secret](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
-named `GCR_JSON_KEY` in your GitHub repository. Set the username to `_json_key`,
-or `_json_key_base64` if you use a base64-encoded key.
-
-```yaml
-name: ci
-
-on:
-  push:
-    branches: main
 
 jobs:
   login:
@@ -214,7 +164,7 @@ jobs:
     steps:
       -
         name: Login to GCR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: gcr.io
           username: _json_key
@@ -223,66 +173,17 @@ jobs:
 
 ### Google Artifact Registry (GAR)
 
-You can authenticate with workload identity federation or a service account.
+Use a service account with the ability to push to GAR and [configure access control](https://cloud.google.com/artifact-registry/docs/access-control).
-
+Then create and download the JSON key for this service account and save content of `.json` file
-#### Workload identity federation
+[as a secret](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
-
+called `GAR_JSON_KEY` in your GitHub repo. Ensure you set the username to `_json_key`.
-Download the key for the service account as a JSON file. Save the contents of
-the file [as a secret](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
-named `GCR_JSON_KEY` in your GitHub repository. Set the username to `_json_key`,
-or `_json_key_base64` if you use a base64-encoded key.
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
-
-jobs:
-  login:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Authenticate to Google Cloud
-        id: auth
-        uses: google-github-actions/auth@v1
-        with:
-          token_format: access_token
-          workload_identity_provider: <workload_identity_provider>
-          service_account: <service_account>
-      -
-        name: Login to GAR
-        uses: docker/login-action@v3
-        with:
-          registry: <location>-docker.pkg.dev
-          username: oauth2accesstoken
-          password: ${{ steps.auth.outputs.access_token }}
-```
-
-> Replace `<workload_identity_provider>` with configured workload identity
-> provider
-
-> Replace `<service_account>` with configured service account in workload
-> identity provider which has access to push to GCR
-
-> Replace `<location>` with the regional or multi-regional [location](https://cloud.google.com/artifact-registry/docs/repo-organize#locations)
-> of the repository where the image is stored.
-
-#### Service account based authentication
-
-Use a service account with permission to push to GAR and [configure access control](https://cloud.google.com/artifact-registry/docs/access-control).
-Download the key for the service account as a JSON file. Save the contents of
-the file [as a secret](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
-named `GCR_JSON_KEY` in your GitHub repository. Set the username to `_json_key`,
-or `_json_key_base64` if you use a base64-encoded key.
-
-```yaml
-name: ci
-
-on:
-  push:
-    branches: main
 
 jobs:
   login:
@@ -290,7 +191,7 @@ jobs:
     steps:
       -
         name: Login to GAR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: <location>-docker.pkg.dev
           username: _json_key
@@ -303,7 +204,7 @@ jobs:
 ### AWS Elastic Container Registry (ECR)
 
 Use an IAM user with the ability to [push to ECR with `AmazonEC2ContainerRegistryPowerUser` managed policy for example](https://docs.aws.amazon.com/AmazonECR/latest/userguide/ecr_managed_policies.html#AmazonEC2ContainerRegistryPowerUser).
-Download the access keys and save them as `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` [as secrets](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
+Then create and download access keys and save `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` [as secrets](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
 in your GitHub repo.
 
 ```yaml
@@ -311,7 +212,7 @@ name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -319,22 +220,22 @@ jobs:
     steps:
       -
         name: Login to ECR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: <aws-account-number>.dkr.ecr.<region>.amazonaws.com
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 ```
 
-If you need to log in to Amazon ECR registries associated with other accounts,
+If you need to log in to Amazon ECR registries associated with other accounts, you can use the `AWS_ACCOUNT_IDS`
-you can use the `AWS_ACCOUNT_IDS` environment variable:
+environment variable:
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -342,7 +243,7 @@ jobs:
     steps:
       -
         name: Login to ECR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: <aws-account-number>.dkr.ecr.<region>.amazonaws.com
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -353,15 +254,15 @@ jobs:
 
 > Only available with [AWS CLI version 1](https://docs.aws.amazon.com/cli/latest/reference/ecr/get-login.html)
 
-You can also use the [Configure AWS Credentials](https://github.com/aws-actions/configure-aws-credentials)
+You can also use the [Configure AWS Credentials](https://github.com/aws-actions/configure-aws-credentials) action in
-action in combination with this action:
+combination with this action:
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -369,14 +270,14 @@ jobs:
     steps:
       -
         name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: <region>
       -
         name: Login to ECR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: <aws-account-number>.dkr.ecr.<region>.amazonaws.com
 ```
@@ -385,17 +286,16 @@ jobs:
 
 ### AWS Public Elastic Container Registry (ECR)
 
-Use an IAM user with permission to push to ECR Public, for example using [managed policies](https://docs.aws.amazon.com/AmazonECR/latest/userguide/security-iam-awsmanpol.html#security-iam-awsmanpol-AmazonEC2ContainerRegistryPowerUser).
+Use an IAM user with the ability to [push to ECR Public with `AmazonElasticContainerRegistryPublicPowerUser` managed policy for example](https://docs.aws.amazon.com/AmazonECR/latest/public/public-ecr-managed-policies.html#AmazonElasticContainerRegistryPublicPowerUser).
-Download the access keys and save them as `AWS_ACCESS_KEY_ID` and
+Then create and download access keys and save `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` [as secrets](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
-`AWS_SECRET_ACCESS_KEY` [secrets](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository)
+in your GitHub repo.
-in your GitHub repository.
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -403,7 +303,7 @@ jobs:
     steps:
       -
         name: Login to Public ECR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: public.ecr.aws
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -429,7 +329,7 @@ name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -437,7 +337,7 @@ jobs:
     steps:
       -
         name: Login to OCIR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: <region>.ocir.io
           username: ${{ secrets.OCI_USERNAME }}
@@ -448,15 +348,14 @@ jobs:
 
 ### Quay.io
 
-Use a [Robot account](https://docs.quay.io/glossary/robot-accounts.html) with
+Use a [Robot account](https://docs.quay.io/glossary/robot-accounts.html) with the ability to push to a public/private Quay.io repository.
-permission to push to a Quay.io repository.
 
 ```yaml
 name: ci
 
 on:
   push:
-    branches: main
+    branches: master
 
 jobs:
   login:
@@ -464,7 +363,7 @@ jobs:
     steps:
       -
         name: Login to Quay.io
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
@@ -475,14 +374,13 @@ jobs:
 
 ### inputs
 
-The following inputs can be used as `step.with` keys:
+Following inputs can be used as `step.with` keys
 
 | Name             | Type    | Default                     | Description                        |
-|------------|--------|---------|-------------------------------------------------------------------------------|
+|------------------|---------|-----------------------------|------------------------------------|
 | `registry`       | String  |                             | Server address of Docker registry. If not set then will default to Docker Hub |
-| `username` | String |         | Username for authenticating to the Docker registry                            |
+| `username`       | String  |                             | Username used to log against the Docker registry |
-| `password` | String |         | Password or personal access token for authenticating the Docker registry      |
+| `password`       | String  |                             | Password or personal access token used to log against the Docker registry |
-| `ecr`      | String | `auto`  | Specifies whether the given registry is ECR (`auto`, `true` or `false`)       |
 | `logout`         | Bool    | `true`                      | Log out from the Docker registry at the end of a job |
 
 ## Keep up-to-date with GitHub Dependabot

__tests__/aws.test.ts

@@ -1,6 +1,4 @@
-import {beforeEach, describe, expect, jest, test} from '@jest/globals';
+import * as semver from 'semver';
-import {AuthorizationData} from '@aws-sdk/client-ecr';
-
 import * as aws from '../src/aws';
 
 describe('isECR', () => {
@@ -12,7 +10,7 @@ describe('isECR', () => {
     ['390948362332.dkr.ecr.cn-northwest-1.amazonaws.com.cn', true],
     ['public.ecr.aws', true]
   ])('given registry %p', async (registry, expected) => {
-    expect(aws.isECR(registry)).toEqual(expected);
+    expect(await aws.isECR(registry)).toEqual(expected);
   });
 });
 
@@ -25,7 +23,40 @@ describe('isPubECR', () => {
     ['390948362332.dkr.ecr.cn-northwest-1.amazonaws.com.cn', false],
     ['public.ecr.aws', true]
   ])('given registry %p', async (registry, expected) => {
-    expect(aws.isPubECR(registry)).toEqual(expected);
+    expect(await aws.isPubECR(registry)).toEqual(expected);
+  });
+});
+
+describe('getCLI', () => {
+  it('exists', async () => {
+    const awsPath = await aws.getCLI();
+    console.log(`awsPath: ${awsPath}`);
+    expect(awsPath).not.toEqual('');
+  });
+});
+
+describe('execCLI', () => {
+  it('--version not empty', async () => {
+    const cliCmdOutput = await aws.execCLI(['--version']);
+    console.log(`cliCmdOutput: ${cliCmdOutput}`);
+    expect(cliCmdOutput).not.toEqual('');
+  }, 100000);
+});
+
+describe('getCLIVersion', () => {
+  it('valid', async () => {
+    const cliVersion = await aws.getCLIVersion();
+    console.log(`cliVersion: ${cliVersion}`);
+    expect(semver.valid(cliVersion)).not.toBeNull();
+  }, 100000);
+});
+
+describe('parseCLIVersion', () => {
+  test.each([
+    ['v1', 'aws-cli/1.18.120 Python/2.7.17 Linux/5.3.0-1034-azure botocore/1.17.43', '1.18.120'],
+    ['v2', 'aws-cli/2.0.41 Python/3.7.3 Linux/4.19.104-microsoft-standard exe/x86_64.ubuntu.18', '2.0.41']
+  ])('given aws %p', async (version, stdout, expected) => {
+    expect(await aws.parseCLIVersion(stdout)).toEqual(expected);
   });
 });
 
@@ -36,122 +67,33 @@ describe('getRegion', () => {
     ['390948362332.dkr.ecr.cn-northwest-1.amazonaws.com.cn', 'cn-northwest-1'],
     ['public.ecr.aws', 'us-east-1']
   ])('given registry %p', async (registry, expected) => {
-    expect(aws.getRegion(registry)).toEqual(expected);
+    expect(await aws.getRegion(registry)).toEqual(expected);
   });
 });
 
 describe('getAccountIDs', () => {
   test.each([
     ['012345678901.dkr.ecr.eu-west-3.amazonaws.com', undefined, ['012345678901']],
-    ['012345678901.dkr.ecr.eu-west-3.amazonaws.com', '012345678910,023456789012', ['012345678901', '012345678910', '023456789012']],
+    [
-    ['012345678901.dkr.ecr.eu-west-3.amazonaws.com', '012345678901,012345678910,023456789012', ['012345678901', '012345678910', '023456789012']],
+      '012345678901.dkr.ecr.eu-west-3.amazonaws.com',
-    ['390948362332.dkr.ecr.cn-northwest-1.amazonaws.com.cn', '012345678910,023456789012', ['390948362332', '012345678910', '023456789012']],
+      '012345678910,023456789012',
+      ['012345678901', '012345678910', '023456789012']
+    ],
+    [
+      '012345678901.dkr.ecr.eu-west-3.amazonaws.com',
+      '012345678901,012345678910,023456789012',
+      ['012345678901', '012345678910', '023456789012']
+    ],
+    [
+      '390948362332.dkr.ecr.cn-northwest-1.amazonaws.com.cn',
+      '012345678910,023456789012',
+      ['390948362332', '012345678910', '023456789012']
+    ],
     ['public.ecr.aws', undefined, []]
   ])('given registry %p', async (registry, accountIDsEnv, expected) => {
     if (accountIDsEnv) {
       process.env.AWS_ACCOUNT_IDS = accountIDsEnv;
     }
-    expect(aws.getAccountIDs(registry)).toEqual(expected);
+    expect(await aws.getAccountIDs(registry)).toEqual(expected);
-  });
-});
-
-const mockEcrGetAuthToken = jest.fn();
-const mockEcrPublicGetAuthToken = jest.fn();
-jest.mock('@aws-sdk/client-ecr', () => {
-  return {
-    ECR: jest.fn(() => ({
-      getAuthorizationToken: mockEcrGetAuthToken
-    }))
-  };
-});
-jest.mock('@aws-sdk/client-ecr-public', () => {
-  return {
-    ECRPUBLIC: jest.fn(() => ({
-      getAuthorizationToken: mockEcrPublicGetAuthToken
-    }))
-  };
-});
-
-describe('getRegistriesData', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    delete process.env.AWS_ACCOUNT_IDS;
-  });
-  // prettier-ignore
-  test.each([
-    [
-      '012345678901.dkr.ecr.aws-region-1.amazonaws.com',
-      'dkr.ecr.aws-region-1.amazonaws.com', undefined,
-      [
-        {
-          registry: '012345678901.dkr.ecr.aws-region-1.amazonaws.com',
-          username: '012345678901',
-          password: 'world'
-        }
-      ]
-    ],
-    [
-      '012345678901.dkr.ecr.eu-west-3.amazonaws.com',
-      'dkr.ecr.eu-west-3.amazonaws.com',
-      '012345678910,023456789012',
-      [
-        {
-          registry: '012345678901.dkr.ecr.eu-west-3.amazonaws.com',
-          username: '012345678901',
-          password: 'world'
-        },
-        {
-          registry: '012345678910.dkr.ecr.eu-west-3.amazonaws.com',
-          username: '012345678910',
-          password: 'world'
-        },
-        {
-          registry: '023456789012.dkr.ecr.eu-west-3.amazonaws.com',
-          username: '023456789012',
-          password: 'world'
-        }
-      ]
-    ],
-    [
-      'public.ecr.aws',
-      undefined,
-      undefined,
-      [
-        {
-          registry: 'public.ecr.aws',
-          username: 'AWS',
-          password: 'world'
-        }
-      ]
-    ]
-  ])('given registry %p', async (registry, fqdn, accountIDsEnv, expected: aws.RegistryData[]) => {
-    if (accountIDsEnv) {
-      process.env.AWS_ACCOUNT_IDS = accountIDsEnv;
-    }
-    const accountIDs = aws.getAccountIDs(registry);
-    const authData: AuthorizationData[] = [];
-    if (accountIDs.length == 0) {
-      mockEcrPublicGetAuthToken.mockImplementation(() => {
-        return Promise.resolve({
-          authorizationData: {
-            authorizationToken: Buffer.from(`AWS:world`).toString('base64'),
-          }
-        });
-      });
-    } else {
-      aws.getAccountIDs(registry).forEach(accountID => {
-        authData.push({
-          authorizationToken: Buffer.from(`${accountID}:world`).toString('base64'),
-          proxyEndpoint: `${accountID}.${fqdn}`
-        });
-      });
-      mockEcrGetAuthToken.mockImplementation(() => {
-        return Promise.resolve({
-          authorizationData: authData
-        });
-      });
-    }
-    const regData = await aws.getRegistriesData(registry);
-    expect(regData).toEqual(expected);
   });
 });

__tests__/context.test.ts

@@ -1,4 +1,4 @@
-import {expect, test} from '@jest/globals';
+import osm = require('os');
 
 import {getInputs} from '../src/context';
 
@@ -8,5 +8,5 @@ test('with password and username getInputs does not throw error', async () => {
   process.env['INPUT_LOGOUT'] = 'true';
   expect(() => {
     getInputs();
-  }).not.toThrow();
+  }).not.toThrowError();
 });

__tests__/docker.test.ts

@@ -1,25 +1,24 @@
-import {expect, jest, test} from '@jest/globals';
+import {loginStandard, logout} from '../src/docker';
+
 import * as path from 'path';
 
-import {loginStandard, logout} from '../src/docker';
+import * as exec from '@actions/exec';
-import {Exec} from '@docker/actions-toolkit/lib/exec';
 
 process.env['RUNNER_TEMP'] = path.join(__dirname, 'runner');
 
 test('loginStandard calls exec', async () => {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  const execSpy: jest.SpyInstance = jest.spyOn(exec, 'getExecOutput');
-  // @ts-ignore
+  execSpy.mockImplementation(() =>
-  const execSpy = jest.spyOn(Exec, 'getExecOutput').mockImplementation(async () => {
+    Promise.resolve({
-    return {
       exitCode: expect.any(Number),
       stdout: expect.any(Function),
       stderr: expect.any(Function)
-    };
+    })
-  });
+  );
 
-  const username = 'dbowie';
+  const username: string = 'dbowie';
-  const password = 'groundcontrol';
+  const password: string = 'groundcontrol';
-  const registry = 'https://ghcr.io';
+  const registry: string = 'https://ghcr.io';
 
   await loginStandard(registry, username, password);
 
@@ -31,17 +30,16 @@ test('loginStandard calls exec', async () => {
 });
 
 test('logout calls exec', async () => {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  const execSpy: jest.SpyInstance = jest.spyOn(exec, 'getExecOutput');
-  // @ts-ignore
+  execSpy.mockImplementation(() =>
-  const execSpy = jest.spyOn(Exec, 'getExecOutput').mockImplementation(async () => {
+    Promise.resolve({
-    return {
       exitCode: expect.any(Number),
       stdout: expect.any(Function),
       stderr: expect.any(Function)
-    };
+    })
-  });
+  );
 
-  const registry = 'https://ghcr.io';
+  const registry: string = 'https://ghcr.io';
 
   await logout(registry);
 

__tests__/main.test.ts

@@ -0,0 +1,73 @@
+import osm = require('os');
+
+import {run} from '../src/main';
+import * as docker from '../src/docker';
+import * as stateHelper from '../src/state-helper';
+
+import * as core from '@actions/core';
+
+test('errors without username and password', async () => {
+  const platSpy = jest.spyOn(osm, 'platform');
+  platSpy.mockImplementation(() => 'linux');
+
+  process.env['INPUT_LOGOUT'] = 'true'; // default value
+
+  const coreSpy: jest.SpyInstance = jest.spyOn(core, 'setFailed');
+
+  await run();
+
+  expect(coreSpy).toHaveBeenCalledWith('Username and password required');
+});
+
+test('successful with username and password', async () => {
+  const platSpy = jest.spyOn(osm, 'platform');
+  platSpy.mockImplementation(() => 'linux');
+
+  const setRegistrySpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setRegistry');
+  const setLogoutSpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setLogout');
+  const dockerSpy: jest.SpyInstance = jest.spyOn(docker, 'login');
+  dockerSpy.mockImplementation(() => {});
+
+  const username: string = 'dbowie';
+  process.env[`INPUT_USERNAME`] = username;
+
+  const password: string = 'groundcontrol';
+  process.env[`INPUT_PASSWORD`] = password;
+
+  const logout: boolean = false;
+  process.env['INPUT_LOGOUT'] = String(logout);
+
+  await run();
+
+  expect(setRegistrySpy).toHaveBeenCalledWith('');
+  expect(setLogoutSpy).toHaveBeenCalledWith(logout);
+  expect(dockerSpy).toHaveBeenCalledWith('', username, password);
+});
+
+test('calls docker login', async () => {
+  const platSpy = jest.spyOn(osm, 'platform');
+  platSpy.mockImplementation(() => 'linux');
+
+  const setRegistrySpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setRegistry');
+  const setLogoutSpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setLogout');
+  const dockerSpy: jest.SpyInstance = jest.spyOn(docker, 'login');
+  dockerSpy.mockImplementation(() => {});
+
+  const username: string = 'dbowie';
+  process.env[`INPUT_USERNAME`] = username;
+
+  const password: string = 'groundcontrol';
+  process.env[`INPUT_PASSWORD`] = password;
+
+  const registry: string = 'ghcr.io';
+  process.env[`INPUT_REGISTRY`] = registry;
+
+  const logout: boolean = true;
+  process.env['INPUT_LOGOUT'] = String(logout);
+
+  await run();
+
+  expect(setRegistrySpy).toHaveBeenCalledWith(registry);
+  expect(setLogoutSpy).toHaveBeenCalledWith(logout);
+  expect(dockerSpy).toHaveBeenCalledWith(registry, username, password);
+});

action.yml

@@ -16,16 +16,12 @@ inputs:
   password:
     description: 'Password or personal access token used to log against the Docker registry'
     required: false
-  ecr:
-    description: 'Specifies whether the given registry is ECR (auto, true or false)'
-    default: 'auto'
-    required: false
   logout:
     description: 'Log out from the Docker registry at the end of a job'
     default: 'true'
     required: false
 
 runs:
-  using: 'node20'
+  using: 'node12'
   main: 'dist/index.js'
   post: 'dist/index.js'

codecov.yml

@@ -1,3 +0,0 @@
-comment: false
-github_checks:
-  annotations: false

dev.Dockerfile

@@ -1,71 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG NODE_VERSION=20
-
-FROM node:${NODE_VERSION}-alpine AS base
-RUN apk add --no-cache cpio findutils git
-WORKDIR /src
-
-FROM base AS deps
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/node_modules \
-  yarn install && mkdir /vendor && cp yarn.lock /vendor
-
-FROM scratch AS vendor-update
-COPY --from=deps /vendor /
-
-FROM deps AS vendor-validate
-RUN --mount=type=bind,target=.,rw <<EOT
-  set -e
-  git add -A
-  cp -rf /vendor/* .
-  if [ -n "$(git status --porcelain -- yarn.lock)" ]; then
-    echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'
-    git status --porcelain -- yarn.lock
-    exit 1
-  fi
-EOT
-
-FROM deps AS build
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/node_modules \
-  yarn run build && mkdir /out && cp -Rf dist /out/
-
-FROM scratch AS build-update
-COPY --from=build /out /
-
-FROM build AS build-validate
-RUN --mount=type=bind,target=.,rw <<EOT
-  set -e
-  git add -A
-  cp -rf /out/* .
-  if [ -n "$(git status --porcelain -- dist)" ]; then
-    echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'
-    git status --porcelain -- dist
-    exit 1
-  fi
-EOT
-
-FROM deps AS format
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/node_modules \
-  yarn run format \
-  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' | cpio -pdm /out
-
-FROM scratch AS format-update
-COPY --from=format /out /
-
-FROM deps AS lint
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/node_modules \
-  yarn run lint
-
-FROM deps AS test
-ENV RUNNER_TEMP=/tmp/github_runner
-ENV RUNNER_TOOL_CACHE=/tmp/github_tool_cache
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/node_modules \
-  yarn run test --coverage --coverageDirectory=/tmp/coverage
-
-FROM scratch AS test-coverage
-COPY --from=test /tmp/coverage /

docker-bake.hcl

@@ -1,3 +1,13 @@
+variable "NODE_VERSION" {
+  default = "12"
+}
+
+target "node-version" {
+  args = {
+    NODE_VERSION = NODE_VERSION
+  }
+}
+
 group "default" {
   targets = ["build"]
 }
@@ -7,47 +17,51 @@ group "pre-checkin" {
 }
 
 group "validate" {
-  targets = ["lint", "build-validate", "vendor-validate"]
+  targets = ["format-validate", "build-validate", "vendor-validate"]
 }
 
 target "build" {
-  dockerfile = "dev.Dockerfile"
+  inherits = ["node-version"]
+  dockerfile = "./hack/build.Dockerfile"
   target = "build-update"
   output = ["."]
 }
 
 target "build-validate" {
-  dockerfile = "dev.Dockerfile"
+  inherits = ["node-version"]
+  dockerfile = "./hack/build.Dockerfile"
   target = "build-validate"
-  output = ["type=cacheonly"]
 }
 
 target "format" {
-  dockerfile = "dev.Dockerfile"
+  inherits = ["node-version"]
+  dockerfile = "./hack/build.Dockerfile"
   target = "format-update"
   output = ["."]
 }
 
-target "lint" {
+target "format-validate" {
-  dockerfile = "dev.Dockerfile"
+  inherits = ["node-version"]
-  target = "lint"
+  dockerfile = "./hack/build.Dockerfile"
-  output = ["type=cacheonly"]
+  target = "format-validate"
 }
 
 target "vendor-update" {
-  dockerfile = "dev.Dockerfile"
+  inherits = ["node-version"]
-  target = "vendor-update"
+  dockerfile = "./hack/vendor.Dockerfile"
+  target = "update"
   output = ["."]
 }
 
 target "vendor-validate" {
-  dockerfile = "dev.Dockerfile"
+  inherits = ["node-version"]
-  target = "vendor-validate"
+  dockerfile = "./hack/vendor.Dockerfile"
-  output = ["type=cacheonly"]
+  target = "validate"
 }
 
 target "test" {
-  dockerfile = "dev.Dockerfile"
+  inherits = ["node-version"]
+  dockerfile = "./hack/test.Dockerfile"
   target = "test-coverage"
   output = ["./coverage"]
 }

hack/build.Dockerfile

@@ -0,0 +1,42 @@
+# syntax=docker/dockerfile:1.2
+ARG NODE_VERSION
+
+FROM node:${NODE_VERSION}-alpine AS base
+RUN apk add --no-cache cpio findutils git
+WORKDIR /src
+
+FROM base AS deps
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn install
+
+FROM deps AS build
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn run build && mkdir /out && cp -Rf dist /out/
+
+FROM scratch AS build-update
+COPY --from=build /out /
+
+FROM build AS build-validate
+RUN --mount=type=bind,target=.,rw \
+  git add -A && cp -rf /out/* .; \
+  if [ -n "$(git status --porcelain -- dist)" ]; then \
+    echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'; \
+    git status --porcelain -- dist; \
+    exit 1; \
+  fi
+
+FROM deps AS format
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn run format \
+  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' | cpio -pdm /out
+
+FROM scratch AS format-update
+COPY --from=format /out /
+
+FROM deps AS format-validate
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn run format-check \

hack/test.Dockerfile

@@ -0,0 +1,34 @@
+# syntax=docker/dockerfile:1.2
+ARG NODE_VERSION
+
+FROM node:${NODE_VERSION}-alpine AS base
+RUN apk add --no-cache binutils curl git unzip
+ENV GLIBC_VER=2.31-r0
+RUN curl -sL "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" -o "/etc/apk/keys/sgerrand.rsa.pub" \
+  && curl -sLO "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-${GLIBC_VER}.apk" \
+  && curl -sLO "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk" \
+  && apk add --no-cache \
+    glibc-${GLIBC_VER}.apk \
+    glibc-bin-${GLIBC_VER}.apk \
+  && curl -sL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+  && unzip -qq "awscliv2.zip" \
+  && ./aws/install \
+  && aws --version
+WORKDIR /src
+
+FROM base AS deps
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn install
+
+FROM deps AS test
+ENV RUNNER_TEMP=/tmp/github_runner
+ENV RUNNER_TOOL_CACHE=/tmp/github_tool_cache
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  --mount=type=bind,from=crazymax/docker,source=/usr/libexec/docker/cli-plugins/docker-buildx,target=/usr/libexec/docker/cli-plugins/docker-buildx \
+  --mount=type=bind,from=crazymax/docker,source=/usr/local/bin/docker,target=/usr/bin/docker \
+  yarn run test --coverageDirectory=/tmp/coverage
+
+FROM scratch AS test-coverage
+COPY --from=test /tmp/coverage /

hack/vendor.Dockerfile

@@ -0,0 +1,23 @@
+# syntax=docker/dockerfile:1.2
+ARG NODE_VERSION
+
+FROM node:${NODE_VERSION}-alpine AS base
+RUN apk add --no-cache git
+WORKDIR /src
+
+FROM base AS vendored
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn install && mkdir /out && cp yarn.lock /out
+
+FROM scratch AS update
+COPY --from=vendored /out /
+
+FROM vendored AS validate
+RUN --mount=type=bind,target=.,rw \
+  git add -A && cp -rf /out/* .; \
+  if [ -n "$(git status --porcelain -- yarn.lock)" ]; then \
+    echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'; \
+    git status --porcelain -- yarn.lock; \
+    exit 1; \
+  fi

jest.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  clearMocks: true,
+  moduleFileExtensions: ['js', 'ts'],
+  setupFiles: ["dotenv/config"],
+  testEnvironment: 'node',
+  testMatch: ['**/*.test.ts'],
+  testRunner: 'jest-circus/runner',
+  transform: {
+    '^.+\\.ts$': 'ts-jest'
+  },
+  verbose: false
+}

jest.config.ts

@@ -1,30 +0,0 @@
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-
-const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'docker-login-action-')).split(path.sep).join(path.posix.sep);
-
-process.env = Object.assign({}, process.env, {
-  TEMP: tmpDir,
-  GITHUB_REPOSITORY: 'docker/login-action',
-  RUNNER_TEMP: path.join(tmpDir, 'runner-temp').split(path.sep).join(path.posix.sep),
-  RUNNER_TOOL_CACHE: path.join(tmpDir, 'runner-tool-cache').split(path.sep).join(path.posix.sep)
-}) as {
-  [key: string]: string;
-};
-
-module.exports = {
-  clearMocks: true,
-  testEnvironment: 'node',
-  moduleFileExtensions: ['js', 'ts'],
-  testMatch: ['**/*.test.ts'],
-  transform: {
-    '^.+\\.ts$': 'ts-jest'
-  },
-  moduleNameMapper: {
-    '^csv-parse/sync': '<rootDir>/node_modules/csv-parse/dist/cjs/sync.cjs'
-  },
-  collectCoverageFrom: ['src/**/{!(main.ts),}.ts'],
-  coveragePathIgnorePatterns: ['lib/', 'node_modules/', '__tests__/'],
-  verbose: true
-};

package.json

@@ -3,15 +3,11 @@
   "description": "GitHub Action to login against a Docker registry",
   "main": "lib/main.js",
   "scripts": {
-    "build": "ncc build src/main.ts --source-map --minify --license licenses.txt",
+    "build": "tsc && ncc build",
-    "lint": "yarn run prettier && yarn run eslint",
+    "format": "prettier --write **/*.ts",
-    "format": "yarn run prettier:fix && yarn run eslint:fix",
+    "format-check": "prettier --check **/*.ts",
-    "eslint": "eslint --max-warnings=0 .",
+    "test": "jest --coverage",
-    "eslint:fix": "eslint --fix .",
+    "pre-checkin": "yarn run format && yarn run build"
-    "prettier": "prettier --check \"./**/*.ts\"",
-    "prettier:fix": "prettier --write \"./**/*.ts\"",
-    "test": "jest",
-    "all": "yarn run build && yarn run format && yarn test"
   },
   "repository": {
     "type": "git",
@@ -22,29 +18,31 @@
     "docker",
     "login"
   ],
-  "author": "Docker Inc.",
+  "author": "Docker",
-  "license": "Apache-2.0",
+  "contributors": [
+    {
+      "name": "CrazyMax",
+      "url": "https://crazymax.dev"
+    }
+  ],
+  "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.10.1",
+    "@actions/core": "^1.4.0",
-    "@aws-sdk/client-ecr": "^3.529.1",
+    "@actions/exec": "^1.1.0",
-    "@aws-sdk/client-ecr-public": "^3.529.1",
+    "@actions/io": "^1.1.1",
-    "@docker/actions-toolkit": "^0.18.0",
+    "semver": "^7.3.5"
-    "http-proxy-agent": "^7.0.2",
-    "https-proxy-agent": "^7.0.4"
   },
   "devDependencies": {
-    "@types/node": "^20.5.9",
+    "@types/jest": "^26.0.3",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@types/node": "^14.0.14",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@vercel/ncc": "^0.23.0",
-    "@vercel/ncc": "^0.38.0",
+    "dotenv": "^8.2.0",
-    "eslint": "^8.48.0",
+    "jest": "^26.1.0",
-    "eslint-config-prettier": "^9.0.0",
+    "jest-circus": "^26.1.0",
-    "eslint-plugin-jest": "^27.2.3",
+    "jest-runtime": "^26.1.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "prettier": "^2.0.5",
-    "jest": "^29.6.4",
+    "ts-jest": "^26.1.1",
-    "prettier": "^3.0.3",
+    "typescript": "^3.9.5",
-    "ts-jest": "^29.1.1",
+    "typescript-formatter": "^7.2.2"
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
   }
 }

src/aws.ts

@@ -1,9 +1,6 @@
-import * as core from '@actions/core';
+import * as semver from 'semver';
-import {ECR} from '@aws-sdk/client-ecr';
+import * as exec from '@actions/exec';
-import {ECRPUBLIC} from '@aws-sdk/client-ecr-public';
+import * as io from '@actions/io';
-import {NodeHttpHandler} from '@smithy/node-http-handler';
-import {HttpProxyAgent} from 'http-proxy-agent';
-import {HttpsProxyAgent} from 'https-proxy-agent';
 
 const ecrRegistryRegex = /^(([0-9]{12})\.dkr\.ecr\.(.+)\.amazonaws\.com(.cn)?)(\/([^:]+)(:.+)?)?$/;
 
@@ -34,104 +31,68 @@ export const getAccountIDs = (registry: string): string[] => {
   if (!matches) {
     return [];
   }
-  const accountIDs: Array<string> = [matches[2]];
+  let accountIDs: Array<string> = [matches[2]];
   if (process.env.AWS_ACCOUNT_IDS) {
     accountIDs.push(...process.env.AWS_ACCOUNT_IDS.split(','));
   }
   return accountIDs.filter((item, index) => accountIDs.indexOf(item) === index);
 };
 
-export interface RegistryData {
+export const getCLI = async (): Promise<string> => {
-  registry: string;
+  return io.which('aws', true);
-  username: string;
+};
-  password: string;
-}
 
-export const getRegistriesData = async (registry: string, username?: string, password?: string): Promise<RegistryData[]> => {
+export const execCLI = async (args: string[]): Promise<string> => {
-  const region = getRegion(registry);
+  return exec
-  const accountIDs = getAccountIDs(registry);
+    .getExecOutput(await getCLI(), args, {
-
+      ignoreReturnCode: true,
-  const authTokenRequest = {};
+      silent: true
-  if (accountIDs.length > 0) {
-    core.debug(`Requesting AWS ECR auth token for ${accountIDs.join(', ')}`);
-    authTokenRequest['registryIds'] = accountIDs;
-  }
-
-  let httpProxyAgent;
-  const httpProxy = process.env.http_proxy || process.env.HTTP_PROXY || '';
-  if (httpProxy) {
-    core.debug(`Using http proxy ${httpProxy}`);
-    httpProxyAgent = new HttpProxyAgent(httpProxy);
-  }
-
-  let httpsProxyAgent;
-  const httpsProxy = process.env.https_proxy || process.env.HTTPS_PROXY || '';
-  if (httpsProxy) {
-    core.debug(`Using https proxy ${httpsProxy}`);
-    httpsProxyAgent = new HttpsProxyAgent(httpsProxy);
-  }
-
-  const credentials =
-    username && password
-      ? {
-          accessKeyId: username,
-          secretAccessKey: password
-        }
-      : undefined;
-
-  if (isPubECR(registry)) {
-    core.info(`AWS Public ECR detected with ${region} region`);
-    const ecrPublic = new ECRPUBLIC({
-      customUserAgent: 'docker-login-action',
-      credentials,
-      region: region,
-      requestHandler: new NodeHttpHandler({
-        httpAgent: httpProxyAgent,
-        httpsAgent: httpsProxyAgent
     })
-    });
+    .then(res => {
-    const authTokenResponse = await ecrPublic.getAuthorizationToken(authTokenRequest);
+      if (res.stderr.length > 0 && res.exitCode != 0) {
-    if (!authTokenResponse.authorizationData || !authTokenResponse.authorizationData.authorizationToken) {
+        throw new Error(res.stderr.trim());
-      throw new Error('Could not retrieve an authorization token from AWS Public ECR');
+      } else if (res.stderr.length > 0) {
-    }
+        return res.stderr.trim();
-    const authToken = Buffer.from(authTokenResponse.authorizationData.authorizationToken, 'base64').toString('utf-8');
-    const creds = authToken.split(':', 2);
-    core.setSecret(creds[0]); // redacted in workflow logs
-    core.setSecret(creds[1]); // redacted in workflow logs
-    return [
-      {
-        registry: 'public.ecr.aws',
-        username: creds[0],
-        password: creds[1]
-      }
-    ];
       } else {
-    core.info(`AWS ECR detected with ${region} region`);
+        return res.stdout.trim();
-    const ecr = new ECR({
-      customUserAgent: 'docker-login-action',
-      credentials,
-      region: region,
-      requestHandler: new NodeHttpHandler({
-        httpAgent: httpProxyAgent,
-        httpsAgent: httpsProxyAgent
-      })
-    });
-    const authTokenResponse = await ecr.getAuthorizationToken(authTokenRequest);
-    if (!Array.isArray(authTokenResponse.authorizationData) || !authTokenResponse.authorizationData.length) {
-      throw new Error('Could not retrieve an authorization token from AWS ECR');
       }
-    const regDatas: RegistryData[] = [];
-    for (const authData of authTokenResponse.authorizationData) {
-      const authToken = Buffer.from(authData.authorizationToken || '', 'base64').toString('utf-8');
-      const creds = authToken.split(':', 2);
-      core.setSecret(creds[0]); // redacted in workflow logs
-      core.setSecret(creds[1]); // redacted in workflow logs
-      regDatas.push({
-        registry: authData.proxyEndpoint || '',
-        username: creds[0],
-        password: creds[1]
     });
+};
+
+export const getCLIVersion = async (): Promise<string> => {
+  return parseCLIVersion(await execCLI(['--version']));
+};
+
+export const parseCLIVersion = async (stdout: string): Promise<string> => {
+  const matches = /aws-cli\/([0-9.]+)/.exec(stdout);
+  if (!matches) {
+    throw new Error(`Cannot parse AWS CLI version`);
   }
-    return regDatas;
+  return semver.clean(matches[1]);
+};
+
+export const getDockerLoginCmds = async (
+  cliVersion: string,
+  registry: string,
+  region: string,
+  accountIDs: string[]
+): Promise<string[]> => {
+  let ecrCmd = (await isPubECR(registry)) ? 'ecr-public' : 'ecr';
+  if (semver.satisfies(cliVersion, '>=2.0.0') || (await isPubECR(registry))) {
+    return execCLI([ecrCmd, 'get-login-password', '--region', region]).then(pwd => {
+      return [`docker login --username AWS --password ${pwd} ${registry}`];
+    });
+  } else {
+    return execCLI([
+      ecrCmd,
+      'get-login',
+      '--region',
+      region,
+      '--registry-ids',
+      accountIDs.join(' '),
+      '--no-include-email'
+    ]).then(dockerLoginCmds => {
+      return dockerLoginCmds.trim().split(`\n`);
+    });
   }
 };

src/context.ts

@@ -4,7 +4,6 @@ export interface Inputs {
   registry: string;
   username: string;
   password: string;
-  ecr: string;
   logout: boolean;
 }
 
@@ -13,7 +12,6 @@ export function getInputs(): Inputs {
     registry: core.getInput('registry'),
     username: core.getInput('username'),
     password: core.getInput('password'),
-    ecr: core.getInput('ecr'),
     logout: core.getBooleanInput('logout')
   };
 }

src/docker.ts

@@ -1,9 +1,9 @@
 import * as aws from './aws';
 import * as core from '@actions/core';
-import {Exec} from '@docker/actions-toolkit/lib/exec';
+import * as exec from '@actions/exec';
 
-export async function login(registry: string, username: string, password: string, ecr: string): Promise<void> {
+export async function login(registry: string, username: string, password: string): Promise<void> {
-  if (/true/i.test(ecr) || (ecr == 'auto' && aws.isECR(registry))) {
+  if (await aws.isECR(registry)) {
     await loginECR(registry, username, password);
   } else {
     await loginStandard(registry, username, password);
@@ -11,9 +11,11 @@ export async function login(registry: string, username: string, password: string
 }
 
 export async function logout(registry: string): Promise<void> {
-  await Exec.getExecOutput('docker', ['logout', registry], {
+  await exec
+    .getExecOutput('docker', ['logout', registry], {
       ignoreReturnCode: true
-  }).then(res => {
+    })
+    .then(res => {
       if (res.stderr.length > 0 && res.exitCode != 0) {
         core.warning(res.stderr.trim());
       }
@@ -25,7 +27,7 @@ export async function loginStandard(registry: string, username: string, password
     throw new Error('Username and password required');
   }
 
-  const loginArgs: Array<string> = ['login', '--password-stdin'];
+  let loginArgs: Array<string> = ['login', '--password-stdin'];
   loginArgs.push('--username', username);
   loginArgs.push(registry);
 
@@ -34,11 +36,13 @@ export async function loginStandard(registry: string, username: string, password
   } else {
     core.info(`Logging into Docker Hub...`);
   }
-  await Exec.getExecOutput('docker', loginArgs, {
+  await exec
+    .getExecOutput('docker', loginArgs, {
       ignoreReturnCode: true,
       silent: true,
       input: Buffer.from(password)
-  }).then(res => {
+    })
+    .then(res => {
       if (res.stderr.length > 0 && res.exitCode != 0) {
         throw new Error(res.stderr.trim());
       }
@@ -47,19 +51,39 @@ export async function loginStandard(registry: string, username: string, password
 }
 
 export async function loginECR(registry: string, username: string, password: string): Promise<void> {
-  core.info(`Retrieving registries data through AWS SDK...`);
+  const cliPath = await aws.getCLI();
-  const regDatas = await aws.getRegistriesData(registry, username, password);
+  const cliVersion = await aws.getCLIVersion();
-  for (const regData of regDatas) {
+  const region = await aws.getRegion(registry);
-    core.info(`Logging into ${regData.registry}...`);
+  const accountIDs = await aws.getAccountIDs(registry);
-    await Exec.getExecOutput('docker', ['login', '--password-stdin', '--username', regData.username, regData.registry], {
+
+  if (await aws.isPubECR(registry)) {
+    core.info(`AWS Public ECR detected with ${region} region`);
+  } else {
+    core.info(`AWS ECR detected with ${region} region`);
+  }
+
+  process.env.AWS_ACCESS_KEY_ID = username || process.env.AWS_ACCESS_KEY_ID;
+  process.env.AWS_SECRET_ACCESS_KEY = password || process.env.AWS_SECRET_ACCESS_KEY;
+
+  core.info(`Retrieving docker login command through AWS CLI ${cliVersion} (${cliPath})...`);
+  const loginCmds = await aws.getDockerLoginCmds(cliVersion, registry, region, accountIDs);
+
+  core.info(`Logging into ${registry}...`);
+  loginCmds.forEach((loginCmd, index) => {
+    exec
+      .getExecOutput(loginCmd, [], {
         ignoreReturnCode: true,
-      silent: true,
+        silent: true
-      input: Buffer.from(regData.password)
+      })
-    }).then(res => {
+      .then(res => {
         if (res.stderr.length > 0 && res.exitCode != 0) {
           throw new Error(res.stderr.trim());
         }
+        if (loginCmds.length > 1) {
+          core.info(`Login Succeeded! (${index}/${loginCmds.length})`);
+        } else {
           core.info('Login Succeeded!');
-    });
         }
+      });
+  });
 }

src/main.ts

@@ -1,21 +1,28 @@
-import * as actionsToolkit from '@docker/actions-toolkit';
+import * as core from '@actions/core';
-
 import * as context from './context';
 import * as docker from './docker';
 import * as stateHelper from './state-helper';
 
-export async function main(): Promise<void> {
+export async function run(): Promise<void> {
-  const input: context.Inputs = context.getInputs();
+  try {
-  stateHelper.setRegistry(input.registry);
+    const {registry, username, password, logout} = context.getInputs();
-  stateHelper.setLogout(input.logout);
+    stateHelper.setRegistry(registry);
-  await docker.login(input.registry, input.username, input.password, input.ecr);
+    stateHelper.setLogout(logout);
+    await docker.login(registry, username, password);
+  } catch (error) {
+    core.setFailed(error.message);
+  }
 }
 
-async function post(): Promise<void> {
+async function logout(): Promise<void> {
   if (!stateHelper.logout) {
     return;
   }
   await docker.logout(stateHelper.registry);
 }
 
-actionsToolkit.run(main, post);
+if (!stateHelper.IsPost) {
+  run();
+} else {
+  logout();
+}

src/state-helper.ts

@@ -1,5 +1,6 @@
 import * as core from '@actions/core';
 
+export const IsPost = !!process.env['STATE_isPost'];
 export const registry = process.env['STATE_registry'] || '';
 export const logout = /true/i.test(process.env['STATE_logout'] || '');
 
@@ -10,3 +11,7 @@ export function setRegistry(registry: string) {
 export function setLogout(logout: boolean) {
   core.saveState('logout', logout);
 }
+
+if (!IsPost) {
+  core.saveState('isPost', 'true');
+}

tsconfig.json

@@ -1,21 +1,18 @@
 {
   "compilerOptions": {
-    "esModuleInterop": true,
     "target": "es6",
     "module": "commonjs",
-    "strict": true,
+    "lib": [
+      "es6",
+      "dom"
+    ],
     "newLine": "lf",
     "outDir": "./lib",
     "rootDir": "./src",
-    "forceConsistentCasingInFileNames": true,
+    "strict": true,
     "noImplicitAny": false,
-    "resolveJsonModule": true,
+    "esModuleInterop": true,
-    "useUnknownInCatchVariables": false,
+    "sourceMap": true
   },
-  "exclude": [
+  "exclude": ["node_modules", "**/*.test.ts"]
-    "./__tests__/**/*",
-    "./lib/**/*",
-    "node_modules",
-    "jest.config.ts"
-  ]
 }