Merge pull request #292 from Cox-Automotive/caiArt

codykoelemay · web-flow · commit 2f4fc95ab1b2 · 2026-01-06T13:32:32.000-06:00
move to artifactory and update alks.js to latest
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -13,10 +13,12 @@ jobs:
   build_and_test:
 
     runs-on: ubuntu-latest
-
+    permissions:
+      id-token: write
+      contents: read
     strategy:
       matrix:
-        node-version: [20.x, 22.x]
+        node-version: [20.x, 22.x, 24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -26,12 +28,24 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
+    - name: Set up Artifactory Auth with OIDC
+      id: jfrog_setup
+      uses: jfrog/setup-jfrog-cli@v4
+      env:
+        JF_URL: https://artifactory.coxautoinc.com
+      with:
+        oidc-provider-name: gh-public
+
+    - name: Configure npm to use Artifactory
+      run: |
+        jf npm-config --repo-resolve cai-npm --server-id-resolve setup-jfrog-cli-server
+
     # Note: if this step is failing due to authentication errors, it is likely because you regenerated the npm-shrinkwrap.json 
     #   file while your local NPM was set to use the coxauto artifactory NPM registry. To fix this, locally delete your node_modules
     #   folder and npm-shrinkwrap.json file, then run `npm i --registry=https://registry.npmjs.org/` to reinstall using public NPM
     #   and then `npm shrinkwrap` to regenerate the npm-shrinkwrap.json file.
     - name: Install dependencies
-      run: npm ci
+      run: jf npm ci
     - run: npm run build --if-present
     - name: Run tests
       run: npm test -- --no-watch
@@ -40,6 +54,7 @@ jobs:
       env:
         REFRESH_TOKEN: ${{ secrets.ALKS_REFRESH_TOKEN }}
         USERNAME: ${{ secrets.ALKS_USER }}
+        NPM_AUTH_TOKEN: ${{ steps.jfrog_setup.outputs.oidc-token }}
       run: |
-        make test CI_MODE=true 
+        make test CI_MODE=true NPM_AUTH_TOKEN=${{ steps.jfrog_setup.outputs.oidc-token }}
       working-directory: ./e2e
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -9,15 +9,30 @@ jobs:
   test-coverage:
     name: Upload Coverage to Sonarqube
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - uses: actions/checkout@v4
         with: 
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 24
+
+      - name: Set up Artifactory Auth with OIDC
+        uses: jfrog/setup-jfrog-cli@v4
+        env:
+          JF_URL: https://artifactory.coxautoinc.com
+        with:
+          oidc-provider-name: gh-public
+
+      - name: Configure npm to use Artifactory
+        run: |
+          jf npm-config --repo-resolve cai-npm --server-id-resolve setup-jfrog-cli-server
+
       - name: Install node modules
-        run: npm ci
+        run: jf npm ci
       - name: Build coverage report
         run: npm run coverage
         env:
diff --git a/.github/workflows/trigger-release.yml b/.github/workflows/trigger-release.yml
@@ -24,6 +24,9 @@ jobs:
     
   bump_version:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     needs: 
       - get_pull_request
     if: ${{ contains(needs.get_pull_request.outputs.pull_request_labels, 'release/patch') || contains(needs.get_pull_request.outputs.pull_request_labels, 'release/minor') || contains(needs.get_pull_request.outputs.pull_request_labels, 'release/major') }}
@@ -35,8 +38,18 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 16
-          registry-url: https://registry.npmjs.org/
+          node-version: 24
+
+      - name: Set up Artifactory Auth with OIDC
+        uses: jfrog/setup-jfrog-cli@v4
+        env:
+          JF_URL: https://artifactory.coxautoinc.com
+        with:
+          oidc-provider-name: gh-public
+
+      - name: Configure npm to use Artifactory
+        run: |
+          jf npm-config --repo-resolve cai-npm --server-id-resolve setup-jfrog-cli-server
 
       - name: Set github user
         run: |
@@ -45,7 +58,7 @@ jobs:
 
       # need to run npm install before npm version so that husky's precommit hooks rebuild the dist/ folder
       - name: install dependencies
-        run: npm ci
+        run: jf npm ci
 
       - name: Get the release level (major/minor/patch) from the labels
         uses: actions-ecosystem/action-release-label@955bf130fba6be3d99d2c14457d0dc7f176bc563
@@ -116,6 +129,11 @@ jobs:
           release_name: ${{ steps.previoustag.outputs.tag }}
           body: ${{ needs.get_pull_request.outputs.pull_request_body }}
 
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+      - name: Configure npm for npmjs publishing
+        run: |
+          echo "registry=https://registry.npmjs.org/" > .npmrc
+
+      - name: Publish to npm with OIDC provenance
+        run: |
+          unset NODE_AUTH_TOKEN
+          npm publish --provenance --access public
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+registry=https://artifactory.coxautoinc.com/artifactory/api/npm/cai-npm/
diff --git a/changelog.txt b/changelog.txt
@@ -1,10 +1,10 @@
-★ Release Notes: 2025-10-16 ★
+★ Release Notes: 2025-12-16 ★
 ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
 
 Thanks for upgrading to the latest version of the ALKS CLI!
 
-* Allows for use of automated change ticket creation or verification when getting keys.
-See [ChangeMinder](https://pages.ghe.coxautoinc.com/ETS-CloudAutomation/Cloud-Platform-Docs/docs/tools_by_cloud_provider/aws/security_services/alks/changeminder) for details.
+* Updated alks.js dependency to latest version (2.14.9) with bug fixes and improvements.
+* Updated CI/CD workflows to use Artifactory for npm package registry.
 
 Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues
 
diff --git a/dist/changelog.txt b/dist/changelog.txt
@@ -1,10 +1,10 @@
-★ Release Notes: 2025-10-16 ★
+★ Release Notes: 2025-12-16 ★
 ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
 
 Thanks for upgrading to the latest version of the ALKS CLI!
 
-* Allows for use of automated change ticket creation or verification when getting keys.
-See [ChangeMinder](https://pages.ghe.coxautoinc.com/ETS-CloudAutomation/Cloud-Platform-Docs/docs/tools_by_cloud_provider/aws/security_services/alks/changeminder) for details.
+* Updated alks.js dependency to latest version (2.14.9) with bug fixes and improvements.
+* Updated CI/CD workflows to use Artifactory for npm package registry.
 
 Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues
 
diff --git a/e2e/Dockerfile b/e2e/Dockerfile
@@ -2,6 +2,11 @@ ARG NODE_VERSION=18
 
 FROM node:${NODE_VERSION}
 
+# Configure npm to use Artifactory
+ARG NPM_AUTH_TOKEN
+RUN npm config set registry https://artifactory.coxautoinc.com/artifactory/api/npm/cai-npm/ && \
+    npm config set //artifactory.coxautoinc.com/artifactory/api/npm/cai-npm/:_authToken ${NPM_AUTH_TOKEN}
+
 # build and install cli from source
 COPY . /alks
 WORKDIR /alks
diff --git a/e2e/Makefile b/e2e/Makefile
@@ -1,5 +1,6 @@
 TOKEN = --build-arg REFRESH_TOKEN=$(REFRESH_TOKEN)
 USER = --build-arg USERNAME=$(USERNAME)
+NPM_AUTH = --build-arg NPM_AUTH_TOKEN=$(NPM_AUTH_TOKEN)
 
 CI_MODE = false
 ifeq ($(CI_MODE),true)
@@ -18,7 +19,7 @@ endif
 
 build:
 	@echo "Building tester..."
-	docker build --no-cache $(TOKEN) $(USER) -t alks-cli-test -f Dockerfile ..
+	docker build --no-cache $(TOKEN) $(USER) $(NPM_AUTH) -t alks-cli-test -f Dockerfile ..
 
 test: build
 	@echo "running intg tests..."
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+registry=https://artifactory.coxautoinc.com/artifactory/api/npm/cai-npm/`