.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/docker-publish-on-comment.yml

@@ -9,17 +9,16 @@ on:
   issue_comment:
     types: [created]
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
 
+env:
+  DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
+  IMAGE_NAME: ${{ vars.IMAGE_NAME }}
+  REGISTRY: ${{ vars.REGISTRY }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: github.event.issue.pull_request && contains(github.event.comment.body, '/publish') && github.event.comment.user.login == 'Oded-B'
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/publish')
     permissions:
       contents: read
       packages: write
@@ -32,7 +31,7 @@ jobs:
 
     steps:
       - name: Get PR branch
-        uses: xt0rted/pull-request-comment-branch@v2
+        uses: xt0rted/pull-request-comment-branch@v3
         id: comment-branch
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -47,21 +46,22 @@ jobs:
 
       # Workaround: https://github.com/docker/build-push-action/issues/461
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
+        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
-      - name: Log into GH registry ${{ env.REGISTRY }}
-        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
+      - name: Log into GH registry (ghcr.io)
+        uses: docker/login-action@7ca345011ac4304463197fac0e56eab1bc7e6af0
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Log into Docker Hub registry ${{ env.REGISTRY }}
-        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
+      - name: Log into Docker Hub registry 
+        if: env.DOCKERHUB_USERNAME != '' 
+        uses: docker/login-action@7ca345011ac4304463197fac0e56eab1bc7e6af0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Extract metadata (tags, labels) for Docker
@@ -70,12 +70,11 @@ jobs:
       # 2nd image name is for DockerHub image
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
+        uses: docker/metadata-action@906ecf0fc0a80f9110f79d9e6c04b1080f4a2621
         with: 
           context: git
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-            wayfaiross/telefonistka
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -86,14 +85,38 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@9f6f8c940b91232557f8699b21341a08624a8dce
+        uses: docker/build-push-action@7e094594beda23fc8f21fa31049f4b203e51096b
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+      - name: Extract Docker metadata - alpine
+        id: meta-alpine
+        uses: docker/metadata-action@906ecf0fc0a80f9110f79d9e6c04b1080f4a2621
+        with:
+          context: git
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha
+          flavor: prefix=alpine-,onlatest=true
+      - name: Build and push Docker image - alpine
+        id: build-and-push-alpine
+        uses: docker/build-push-action@7e094594beda23fc8f21fa31049f4b203e51096b
+        with:
+          context: .
+          target: alpine-release
+          push: true
+          tags: ${{ steps.meta-alpine.outputs.tags }}
+          labels: ${{ steps.meta-alpine.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
       - name: Set latest commit status as ${{ job.status }}
         uses: myrotvorets/set-commit-status-action@master
         if: always()

.github/workflows/docker-publish.yml

@@ -16,11 +16,9 @@ on:
     branches: [ "main" ]
 
 env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
+  DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
+  IMAGE_NAME: ${{ vars.IMAGE_NAME }}
+  REGISTRY: ${{ vars.REGISTRY }}
 
 jobs:
   build:
@@ -49,23 +47,23 @@ jobs:
 
       # Workaround: https://github.com/docker/build-push-action/issues/461
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
+        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
-      - name: Log into GH registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
+      - name: Log into GH registry (ghcr.io)
+        if: github.event_name != 'pull_request'  
+        uses: docker/login-action@7ca345011ac4304463197fac0e56eab1bc7e6af0
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Log into Docker Hub registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
+      - name: Log into Docker Hub registry 
+        if: github.event_name != 'pull_request' && env.DOCKERHUB_USERNAME != ''
+        uses: docker/login-action@7ca345011ac4304463197fac0e56eab1bc7e6af0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Extract metadata (tags, labels) for Docker
@@ -74,18 +72,17 @@ jobs:
       # 2nd image name is for DockerHub image
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
+        uses: docker/metadata-action@906ecf0fc0a80f9110f79d9e6c04b1080f4a2621
         with: 
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-            wayfaiross/telefonistka
 
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@9f6f8c940b91232557f8699b21341a08624a8dce
+        uses: docker/build-push-action@7e094594beda23fc8f21fa31049f4b203e51096b
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
@@ -94,6 +91,32 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+    # Extract metadata (tags, labels) for Docker
+    # https://github.com/docker/metadata-action
+    # 1st image name is for GH package repo
+    # 2nd image name is for DockerHub image
+      - name: Extract Docker metadata - alpine
+        id: meta-alpine
+        uses: docker/metadata-action@906ecf0fc0a80f9110f79d9e6c04b1080f4a2621
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: prefix=alpine-,onlatest=true
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image - alpine
+        id: build-and-push-alpine
+        uses: docker/build-push-action@7e094594beda23fc8f21fa31049f4b203e51096b
+        with:
+          context: .
+          target: alpine-release
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-alpine.outputs.tags }}
+          labels: ${{ steps.meta-alpine.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker

.github/workflows/lint.yml

@@ -17,28 +17,30 @@ jobs:
         uses: avto-dev/markdown-lint@v1
         with:
           config: '.markdownlint.json'
-          args: '**/*.md .github/**/*.md'
+          args: '*.md docs/*.md .github/**/*.md'
   renovate:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: 🧼 lint renovate config # Validates changes to renovate.json config file
-        uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.0.1
+        uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.1.1
         with:
           config_file_path: 'renovate.json'
   golangci:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
-      - uses: actions/checkout@v4
+          go-version-file: go.mod
+      - run: make get-deps
+      - run: go mod tidy -diff
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.50.1
+          version: v1.64.7
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.gitignore

@@ -1,2 +1,4 @@
 /telefonistka
 vendor/
+internal/pkg/mocks/argocd_settings.go
+internal/pkg/mocks/argocd_project.go

.golangci.yml

@@ -10,7 +10,7 @@ linters:
     - durationcheck
     - errcheck
     - errname
-    - exportloopref
+    - copyloopvar
     - gci
     - gochecknoinits
     - gofmt

.markdownlint.json

@@ -12,5 +12,6 @@
     "MD025": {
         "front_matter_title": ""
     },
-    "MD041": false
+    "MD041": false,
+	"MD034": false
 }

CODEOWNERS

@@ -0,0 +1 @@
+* @commercetools/special-delivery

Dockerfile

@@ -1,14 +1,13 @@
 
-FROM golang:1.21.5 as test
+FROM golang:1.24.1 AS test
 ARG GOPROXY
 ENV GOPATH=/go
 ENV PATH="$PATH:$GOPATH/bin"
 WORKDIR /go/src/github.com/wayfair-incubator/telefonistka
 COPY . ./
 RUN make test
 
-FROM test as build
-# FROM golang:1.18.3 as build
+FROM test AS build
 ARG GOPROXY
 ENV GOPATH=/go
 ENV PATH="$PATH:$GOPATH/bin"
@@ -17,6 +16,15 @@ COPY . ./
 RUN make build
 
 
+FROM alpine:latest AS alpine-release
+WORKDIR /telefonistka
+COPY --from=build /go/src/github.com/wayfair-incubator/telefonistka/telefonistka /telefonistka/bin/telefonistka
+COPY templates/ /telefonistka/templates/
+# This next line is hack to overcome GH actions lack of support for docker workdir override https://github.com/actions/runner/issues/878
+COPY templates/ /github/workspace/templates/
+USER 1001
+ENTRYPOINT ["/telefonistka/bin/telefonistka"]
+CMD ["server"]
 
 
 

Makefile

@@ -12,7 +12,8 @@ VENDOR_DIR = vendor
 get-deps: $(VENDOR_DIR)
 
 $(VENDOR_DIR):
-	GO111MODULE=on go mod vendor
+	go generate $$(go list ./internal/pkg/mocks/...)
+	go mod download
 
 .PHONY: build
 build: $(VENDOR_DIR)
@@ -24,5 +25,5 @@ clean:
 
 .PHONY: test
 test: $(VENDOR_DIR)
-	go test -v -timeout 30s .
+	TEMPLATES_PATH=../../../templates/ go test -v -timeout 30s ./...