Ccxdev 10244

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+
+version: 2
+updates:
+  - package-ecosystem: "gomod" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/bdd.yaml

@@ -0,0 +1,47 @@
+name: BDD tests
+
+on:
+  pull_request:
+
+jobs:
+  bdd:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        go-version:
+          - "1.20"
+    name: BDD for Go ${{ matrix.go-version}}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Build project
+        run: make build
+      - name: Retrieve Docker compose file
+        run: wget -O docker-compose.yml https://raw.githubusercontent.com/RedHatInsights/insights-behavioral-spec/main/docker-compose.yml
+      - name: Retrieve BDD runner
+        run: wget -O bdd_runner.sh https://raw.githubusercontent.com/RedHatInsights/insights-behavioral-spec/main/run_in_docker.sh && chmod +x bdd_runner.sh
+      - name: Run BDD
+        run: ./bdd_runner.sh aggregator-tests .
+      - name: Set container ID as env
+        if: always()
+        run: echo "BDD_CONTAINER=$(docker ps | grep 'insights-behavioral-spec:latest' | cut -d ' ' -f 1)" >> $GITHUB_ENV
+      - name: Debug
+        if: always()
+        run: docker exec -u root "$BDD_CONTAINER" /bin/bash -c "ls -R /insights-behavioral-spec/logs"
+      - name: Copy logs from container to host
+        if: always()
+        run: docker cp "$BDD_CONTAINER:/insights-behavioral-spec/logs" .
+      - name: Rename logs
+        if: always()
+        # Otherwise the upload-artifact action will complain
+        run: for filename in logs/insights-results-aggregator/*; do mv -n "$filename" "$(echo "$filename" | sed -e 's/["><:]//g')";  done
+      - name: Store service logs
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: store-logs
+          path: |
+            logs/insights-results-aggregator

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,37 @@
+# Set as automatically merge all the pull requests created by dependabot[bot]
+name: Dependabot auto-merge
+on: pull_request
+
+# This section adds write permissions to the secrets.GITHUB_TOKEN. Default is just read
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Github Actions bot approves the PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+            PR_URL: ${{github.event.pull_request.html_url}}
+            GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: InsightsDroid approves the PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.INSIGHTSDROID_TOKEN}}
+      - name: Enable auto-merge for Dependabot PRs
+        # We can filter depending on the semver major, minor, or patch updates,
+        # but let's not do it for now
+        # if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/gh-pages.yml

@@ -30,9 +30,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.18'
+          go-version: '1.20'
       - name: Generate docgo and literate
         run: make godoc
       - name: Build with Jekyll

.github/workflows/golangci-lint.yml

@@ -1,16 +1,12 @@
 name: golangci-lint
 on:
-  push:
-    tags:
-      - v*
-    branches:
-      - master
-      - main
   pull_request:
+
 permissions:
   contents: read
   # Optional: allow read access to pull request. Use with `only-new-issues` option.
   # pull-requests: read
+
 jobs:
   golangci:
     name: lint
@@ -31,9 +27,9 @@ jobs:
           args: >
             --enable=goimports,gosimple,nilerr,prealloc,revive,staticcheck,unconvert,unused,whitespace,zerologlint
             --timeout=3m
-          
+
           # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
+          only-new-issues: true
 
           # Optional: if set to true then the action will use pre-installed Go.
           # skip-go-installation: true

.github/workflows/gotests.yaml

@@ -0,0 +1,42 @@
+name: Go tests
+
+on:
+  pull_request:
+
+jobs:
+  gotests:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        go-version:
+          - "1.20"
+          - "1.21"
+    name: Tests for Go ${{ matrix.go-version}}
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: aggregator
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Print env vars
+        run: env
+      - name: Unit tests
+        run: make test
+      - name: Check code coverage
+        run: ./check_coverage.sh do-not-run-tests
+      - name: Display code coverage
+        run: make coverage

.github/workflows/linters.yaml

@@ -0,0 +1,44 @@
+name: Go linters
+
+on:
+  pull_request:
+
+jobs:
+  golint:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        go-version:
+          - "1.20"
+          - "1.21"
+    name: Linters for Go ${{ matrix.go-version}}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Build project
+        run: go build
+      - name: GO formatting
+        run: make fmt
+      - name: GO lint 
+        run: make lint
+      - name: GO vet
+        run: make vet
+      - name: gocyclo
+        run: make cyclo
+      - name: shellcheck
+        run: make shellcheck
+      - name: errcheck
+        run: make errcheck
+      - name: goconst checker
+        run: make goconst
+      - name: gosec checker
+        run: make gosec
+      - name: ineffassign checker
+        run: make ineffassign
+      - name: ABC metrics checker
+        run: make abcgo
+      - name: JSON checker
+        run: make json-check

.github/workflows/shellcheck.yaml

@@ -0,0 +1,12 @@
+name: Shell check
+
+on:
+  pull_request:
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Shell check
+        run: ./shellcheck.sh

Dockerfile

@@ -12,22 +12,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.redhat.io/rhel8/go-toolset:1.18.9-8.1675807488 AS builder
+FROM registry.redhat.io/ubi9/go-toolset:1.20 AS builder
 
 COPY . .
 
 USER 0
 
 # build the aggregator
-RUN umask 0022 && \
-    make build && \
-    chmod a+x insights-results-aggregator
+RUN umask 0022
+ENV GOFLAGS="-buildvcs=false"
+RUN make build
+RUN chmod a+x insights-results-aggregator
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014
+FROM registry.access.redhat.com/ubi9/ubi-micro:latest
 
 COPY --from=builder /opt/app-root/src/insights-results-aggregator .
 COPY --from=builder /opt/app-root/src/openapi.json /openapi/openapi.json
 
+# copy the certificates from builder image
+COPY --from=builder /etc/ssl /etc/ssl
+COPY --from=builder /etc/pki /etc/pki
+
 USER 1001
 
 CMD ["/insights-results-aggregator"]

Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-.PHONY: default clean build fmt lint vet cyclo ineffassign shellcheck errcheck goconst gosec abcgo json-check openapi-check style run test cover integration_tests rest_api_tests sqlite_db license before_commit help godoc install_docgo install_addlicense
+.PHONY: default clean build fmt lint vet cyclo ineffassign shellcheck errcheck goconst gosec abcgo json-check openapi-check style run test cover integration_tests rest_api_tests license before_commit help godoc install_docgo install_addlicense
 
 SOURCES:=$(shell find . -name '*.go')
 BINARY:=insights-results-aggregator
@@ -90,10 +90,6 @@ rest_api_tests: ${BINARY} ## Run REST API tests
 	@echo "Running REST API tests"
 	@./test.sh rest_api
 
-sqlite_db:
-	mv aggregator.db aggragator.db.backup
-	local_storage/create_database_sqlite.sh
-
 license: install_addlicense
 	addlicense -c "Red Hat, Inc" -l "apache" -v ./