running protos on docker

alanprot · alanprot · commit 5696b047619b · 2024-11-29T11:32:02.000-08:00
diff --git a/.github/workflows/scripts/install-docker.sh b/.github/workflows/scripts/install-docker.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -x
+VER="20.10.19"
+curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
+tar -xz -C /tmp -f /tmp/docker-$VER.tgz
+mkdir -vp ~/.docker/cli-plugins/
+curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+chmod a+x ~/.docker/cli-plugins/docker-buildx
+mv /tmp/docker/* /usr/bin
+docker run --privileged --rm tonistiigi/binfmt --install all
diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -34,17 +34,12 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Setup Git safe.directory
-        run: |
-          echo "this step is needed because when running in container, actions/checkout does not set safe.directory effectively."
-          echo "See https://github.com/actions/runner/issues/2033. We should use --system instead of --global"
-          git config --system --add safe.directory $GITHUB_WORKSPACE
-        # Commands in the Makefile are hardcoded with an assumed file structure of the CI container
-        # Symlink ensures paths specified in previous commands don’t break
-      - name: Sym Link Expected Path to Workspace
-        run: |
-          mkdir -p /go/src/github.com/cortexproject/weaveworks-common
-          ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/weaveworks-common
+      - name: Install Docker Client
+        run: sudo ./.github/workflows/scripts/install-docker.sh
+      - name: Download Docker Images Artifact
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: Docker Images
       - name: CheckProtos
         run: make check-protos
 
diff --git a/instrument/instrument_test.go b/instrument/instrument_test.go
@@ -60,7 +60,7 @@ func TestCollectedRequest(t *testing.T) {
 
 func TestCollectedRequest_Error(t *testing.T) {
 	c := &spyCollector{}
-	require.NoError(t, instrument.CollectedRequest(context.Background(), "test", c, nil, func(_ context.Context) error {
+	require.Error(t, instrument.CollectedRequest(context.Background(), "test", c, nil, func(_ context.Context) error {
 		return errors.New("boom")
 	}))
 	assert.True(t, c.before)
diff --git a/mflag/flag_test.go b/mflag/flag_test.go
@@ -85,7 +85,7 @@ func TestEverything(t *testing.T) {
 	require.NoError(t, Set("test_uint64", "1"))
 	require.NoError(t, Set("test_string", "1"))
 	require.NoError(t, Set("test_float64", "1"))
-	require.NoError(t, Set("testrequire.NoError(_duration", "1s"))
+	require.NoError(t, Set("test_duration", "1s"))
 	desired = "1"
 	Visit(visitor)
 	if len(m) != 8 {
@@ -276,7 +276,7 @@ func testPanic(f *FlagSet, t *testing.T) {
 	args := []string{
 		"-int", "21",
 	}
-	require.NoError(t, f.Parse(args))
+	f.Parse(args) //nolint:errcheck
 }
 
 func TestParsePanic(t *testing.T) {
diff --git a/middleware/logging_test.go b/middleware/logging_test.go
@@ -38,8 +38,7 @@ func TestBadWriteLogging(t *testing.T) {
 			Log: logging.Logrus(logrusLogger),
 		}
 		handler := func(w http.ResponseWriter, r *http.Request) {
-			_, err := io.WriteString(w, "<html><body>Hello World!</body></html>")
-			require.NoError(t, err)
+			io.WriteString(w, "<html><body>Hello World!</body></html>") //nolint:errcheck
 		}
 		loggingHandler := loggingMiddleware.Wrap(http.HandlerFunc(handler))
 
@@ -129,8 +128,7 @@ func TestLoggingRequestsAtInfoLevel(t *testing.T) {
 			LogRequestAtInfoLevel: true,
 		}
 		handler := func(w http.ResponseWriter, r *http.Request) {
-			_, err := io.WriteString(w, "<html><body>Hello World!</body></html>")
-			require.NoError(t, err)
+			io.WriteString(w, "<html><body>Hello World!</body></html>") //nolint:errcheck
 		}
 		loggingHandler := loggingMiddleware.Wrap(http.HandlerFunc(handler))
 

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ func TestBadWriteLogging(t *testing.T) {`
`38`	`38`	`Log: logging.Logrus(logrusLogger),`
`39`	`39`	`}`
`40`	`40`	`handler := func(w http.ResponseWriter, r *http.Request) {`
`41`		`- _, err := io.WriteString(w, "<html><body>Hello World!</body></html>")`
`42`		`- require.NoError(t, err)`
	`41`	`+ io.WriteString(w, "<html><body>Hello World!</body></html>") //nolint:errcheck`
`43`	`42`	`}`
`44`	`43`	`loggingHandler := loggingMiddleware.Wrap(http.HandlerFunc(handler))`
`45`	`44`
`@@ -129,8 +128,7 @@ func TestLoggingRequestsAtInfoLevel(t *testing.T) {`
`129`	`128`	`LogRequestAtInfoLevel: true,`
`130`	`129`	`}`
`131`	`130`	`handler := func(w http.ResponseWriter, r *http.Request) {`
`132`		`- _, err := io.WriteString(w, "<html><body>Hello World!</body></html>")`
`133`		`- require.NoError(t, err)`
	`131`	`+ io.WriteString(w, "<html><body>Hello World!</body></html>") //nolint:errcheck`
`134`	`132`	`}`
`135`	`133`	`loggingHandler := loggingMiddleware.Wrap(http.HandlerFunc(handler))`
`136`	`134`