Merge pull request #73 from grafana/rooneyshuman/add-ci

Add docker make commands and CI

Author: rooneyshuman

.github/workflows/go.yml

@@ -2,13 +2,13 @@ name: Go
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, dev/hackathon-dec-2023 ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, dev/hackathon-dec-2023 ]
 
 jobs:
 
-  build:
+  test:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -18,11 +18,21 @@ jobs:
       with:
         go-version: 1.21
 
-    - name: Build
-      run: go build -v ./...
-
     - name: Test
-      run: go test ./...
+      run: make test
 
     - name: Benchmark
-      run: go test -v -run=XXX -benchmem -bench=. ./...
+      run: make benchmark
+
+  checks:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.21
+
+    - name: Checks
+      run: make checks

Makefile

@@ -4,6 +4,9 @@ BUILDFLAGS = -v
 BENCH = .
 BENCHFLAGS = -benchmem -bench=${BENCH}
 
+IMAGE_PREFIX ?= us.gcr.io/kubernetes-dev
+GIT_VERSION ?= $(shell git describe --tags --always --dirty)
+
 build:
 	go build ${BUILDFLAGS} ${PKGS}
 
@@ -15,9 +18,16 @@ benchmark:
 
 checks:
 	go vet ${PKGS}
-	staticcheck ${PKGS}
+	go run honnef.co/go/tools/cmd/staticcheck@latest ${PKGS}
 	make lint
 
 lint:
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run -c .golangci.yml -v
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run -c .golangci.yml
+
+docker:
+	docker build --build-arg=GIT_VERSION=$(GIT_VERSION) -t $(IMAGE_PREFIX)/unused -f Dockerfile.exporter .
+	docker tag $(IMAGE_PREFIX)/unused $(IMAGE_PREFIX)/unused:$(GIT_VERSION)
 
+push: docker
+	docker push $(IMAGE_PREFIX)/unused:$(GIT_VERSION)
+	docker push $(IMAGE_PREFIX)/unused:latest

azure/provider.go

@@ -25,7 +25,7 @@ func (p *Provider) Name() string { return "Azure" }
 // Meta returns the provider metadata.
 func (p *Provider) Meta() unused.Meta { return p.meta }
 
-// Id returns the subscription for this provider.
+// ID returns the subscription for this provider.
 func (p *Provider) ID() string { return p.client.SubscriptionID }
 
 // NewProvider creates a new Azure [unused.Provider].

cmd/unused-exporter/exporter.go

@@ -182,7 +182,7 @@ func (e *exporter) pollProvider(p unused.Provider) {
 			}
 
 			addMetric(e.info, 1)
-			addMetric(e.dur, int64(dur.Microseconds()))
+			addMetric(e.dur, dur.Microseconds())
 			addMetric(e.suc, success)
 
 			for ns, di := range diskInfoByNamespace {