feat: test packages separately

.github/workflows/check.yml

@@ -5,6 +5,26 @@
   "USE_GITHUB_APP_TOKEN": "${{ inputs.use_github_app_token }}"
 "jobs":
   "check":
+    "env":
+      "SKIP_VALIDATION": "${{ inputs.skip_validation }}"
+    "needs":
+    - "checkFiles"
+    - "faillint"
+    - "golangciLint"
+    - "lintFiles"
+    - "integration"
+    - "testLambdaPromtail"
+    - "testPackages"
+    - "testPushPackage"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "name": "checkout"
+      "uses": "actions/checkout@v4"
+    - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
+      "name": "checks passed"
+      "run": |
+        echo "All checks passed"
+  "checkFiles":
     "container":
       "image": "${{ inputs.build_image }}"
     "env":
@@ -78,7 +98,44 @@
           cp -r docs/sources/* /hugo/content/docs/loki/latest/
           cd /hugo && make prod
         EOF
-  "integration":
+  "collectPackages":
+    "outputs":
+      "packages": "${{ steps.gather-tests.outputs.packages }}"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "name": "checkout"
+      "uses": "actions/checkout@v4"
+    - "name": "fix git dubious ownership"
+      "run": |
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
+    - "id": "gather-tests"
+      "name": "gather packages"
+      "run": |
+        echo "packages=$(find . -path '*_test.go' -printf '%h\n' \
+          | grep -e "pkg/push" -e "integration" -e "operator" -e "lambda-promtail" -v \
+          | cut  -d / -f 2,3 \
+          | uniq \
+          | sort \
+          | jq --raw-input --slurp --compact-output 'split("\n")[:-1]')" >> ${GITHUB_OUTPUT}
+  "faillint":
+    "container":
+      "image": "${{ inputs.build_image }}"
+    "env":
+      "BUILD_IN_CONTAINER": false
+      "SKIP_VALIDATION": "${{ inputs.skip_validation }}"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "name": "checkout"
+      "uses": "actions/checkout@v4"
+    - "name": "fix git dubious ownership"
+      "run": |
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
+    - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
+      "name": "faillint"
+      "run": |
+        faillint -paths "sync/atomic=go.uber.org/atomic" ./...
+
+  "golangciLint":
     "container":
       "image": "${{ inputs.build_image }}"
     "env":
@@ -112,10 +169,29 @@
         "tar_args": "xvf"
         "tarball_binary_path": "*/${binary}"
         "version": "0.9.0"
+    - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
+      "name": "golangci-lint"
+      "uses": "golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5"
+      "with":
+        "only-new-issues": true
+        "version": "${{ inputs.golang_ci_lint_version }}"
+  "integration":
+    "container":
+      "image": "${{ inputs.build_image }}"
+    "env":
+      "BUILD_IN_CONTAINER": false
+      "SKIP_VALIDATION": "${{ inputs.skip_validation }}"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "name": "checkout"
+      "uses": "actions/checkout@v4"
+    - "name": "fix git dubious ownership"
+      "run": |
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
       "name": "integration"
       "run": "make test-integration"
-  "lint":
+  "lintFiles":
     "container":
       "image": "${{ inputs.build_image }}"
     "env":
@@ -149,9 +225,6 @@
         "tar_args": "xvf"
         "tarball_binary_path": "*/${binary}"
         "version": "0.9.0"
-    - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
-      "name": "lint"
-      "run": "make lint"
     - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
       "name": "lint scripts"
       "run": "make lint-scripts"
@@ -160,13 +233,7 @@
       "run": |
         git fetch origin
         make check-format
-    - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
-      "name": "golangci-lint"
-      "uses": "golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5"
-      "with":
-        "only-new-issues": true
-        "version": "${{ inputs.golang_ci_lint_version }}"
-  "test":
+  "testLambdaPromtail":
     "container":
       "image": "${{ inputs.build_image }}"
     "env":
@@ -176,33 +243,54 @@
     "steps":
     - "name": "checkout"
       "uses": "actions/checkout@v4"
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
     - "name": "fix git dubious ownership"
       "run": |
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
-      "name": "install tar"
+      "name": "test push package"
       "run": |
-        apt update
-        apt install -qy tar xz-utils
+        gotestsum -- -covermode=atomic -coverprofile=coverage.txt -p=4 ./...
+      "working-directory": "tools/lambda-promtail"
+  "testPackages":
+    "container":
+      "image": "${{ inputs.build_image }}"
+    "env":
+      "BUILD_IN_CONTAINER": false
+      "SKIP_VALIDATION": "${{ inputs.skip_validation }}"
+    "needs":
+    - "collectPackages"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "name": "checkout"
+      "uses": "actions/checkout@v4"
+    - "name": "fix git dubious ownership"
+      "run": |
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
-      "name": "install shellcheck"
-      "uses": "./lib/actions/install-binary"
-      "with":
-        "binary": "shellcheck"
-        "download_url": "https://github.com/koalaman/shellcheck/releases/download/v${version}/shellcheck-v${version}.linux.x86_64.tar.xz"
-        "smoke_test": "${binary} --version"
-        "tar_args": "xvf"
-        "tarball_binary_path": "*/${binary}"
-        "version": "0.9.0"
+      "name": "test ${{ matrix.package }}"
+      "run": |
+        gotestsum -- -covermode=atomic -coverprofile=coverage.txt -p=4 ./${{ matrix.package }}/...
+    "strategy":
+      "matrix":
+        "package": "${{fromJson(needs.collectPackages.outputs.packages)}}"
+  "testPushPackage":
+    "container":
+      "image": "${{ inputs.build_image }}"
+    "env":
+      "BUILD_IN_CONTAINER": false
+      "SKIP_VALIDATION": "${{ inputs.skip_validation }}"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "name": "checkout"
+      "uses": "actions/checkout@v4"
+    - "name": "fix git dubious ownership"
+      "run": |
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}"
-      "name": "test"
-      "run": "make test"
+      "name": "test push package"
+      "run": |
+        gotestsum -- -covermode=atomic -coverprofile=coverage.txt -p=4 ./...
+      "working-directory": "pkg/push"
 "name": "check"
 "on":
   "workflow_call":
@@ -234,4 +322,4 @@
 "permissions":
   "contents": "write"
   "id-token": "write"
-  "pull-requests": "write"
+  "pull-requests": "write"

.github/workflows/gel-check.yml

@@ -209,4 +209,4 @@
 "permissions":
   "contents": "write"
   "id-token": "write"
-  "pull-requests": "write"
+  "pull-requests": "write"

.github/workflows/release-pr.yml

@@ -314,4 +314,4 @@ name: "Create Release PR"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"

.github/workflows/release.yml

@@ -218,4 +218,4 @@ name: "Create Release"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"

.github/workflows/test-release-pr.yml

@@ -315,4 +315,4 @@ name: "Test Create Release PR Action"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"

.golangci.yml

@@ -52,7 +52,9 @@ linters-settings:
       Main:
         allow:
           - fmt
+          - testing
           - github.com/hashicorp/go-uuid
+          - github.com/stretchr/testify
 
   misspell:
     ignore-words:

cmd/loki/main_test.go

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/hashicorp/go-uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_Main(t *testing.T) {
+	t.Run("Test main", func(t *testing.T) {
+		require.True(t, true)
+
+		uid, err := uuid.GenerateUUID()
+		require.NoError(t, err)
+		require.NotEmpty(t, uid)
+	})
+}

go.mod

@@ -4,4 +4,13 @@ go 1.21
 
 toolchain go1.21.3
 
-require github.com/hashicorp/go-uuid v1.0.3
+require (
+	github.com/hashicorp/go-uuid v1.0.3
+	github.com/stretchr/testify v1.9.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -1,2 +1,12 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/push/go.mod

@@ -0,0 +1,16 @@
+module github.com/grafana/loki-release/pkg/push
+
+go 1.21
+
+toolchain go1.21.3
+
+require (
+	github.com/hashicorp/go-uuid v1.0.3
+	github.com/stretchr/testify v1.9.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

pkg/push/go.sum

@@ -0,0 +1,12 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/push/push_test.go

@@ -0,0 +1,18 @@
+package push
+
+import (
+	"testing"
+
+	"github.com/hashicorp/go-uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_Push(t *testing.T) {
+	t.Run("Test main", func(t *testing.T) {
+		require.True(t, true)
+
+		uid, err := uuid.GenerateUUID()
+		require.NoError(t, err)
+		require.NotEmpty(t, uid)
+	})
+}