From 5ef51bc032dbcd3cc2d77d4c45bdf5ef060ad6f4 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 3 Jun 2025 10:14:40 +0530 Subject: [PATCH 1/4] upgrade golang version --- go.mod | 2 +- main.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d20f8af..2c926f9 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/jsha/minica -go 1.15 +go 1.22 diff --git a/main.go b/main.go index 591bf4f..537d2d4 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,6 @@ import ( "encoding/pem" "flag" "fmt" - "io/ioutil" "log" "math" "math/big" @@ -39,8 +38,8 @@ type issuer struct { } func getIssuer(keyFile, certFile string, alg x509.PublicKeyAlgorithm) (*issuer, error) { - keyContents, keyErr := ioutil.ReadFile(keyFile) - certContents, certErr := ioutil.ReadFile(certFile) + keyContents, keyErr := os.ReadFile(keyFile) + certContents, certErr := os.ReadFile(certFile) if os.IsNotExist(keyErr) && os.IsNotExist(certErr) { err := makeIssuer(keyFile, certFile, alg) if err != nil { From bea926c6ed9d648b49ceb75cf5a26e6c6b7de886 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 3 Jun 2025 10:29:08 +0530 Subject: [PATCH 2/4] add makefile --- Makefile | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b655b3d --- /dev/null +++ b/Makefile @@ -0,0 +1,95 @@ +# Variables +TAG := v1.1.0 +LDFLAGS := -X main.buildVersion=$(TAG) +GO111MODULE := on +GO_VERSION := 1.22 +BINARY_NAME := minica + +# Default target +.DEFAULT_GOAL := help + +# Silent mode +.SILENT: + +# Phony targets +.PHONY: all help deps build clean test fmt lint dist dist-clean release check-go-version + +# Help target +help: + @echo "Available targets:" + @echo " all - Build the binary (default)" + @echo " help - Show this help message" + @echo " deps - Download dependencies" + @echo " build - Build the binary" + @echo " clean - Remove build artifacts" + @echo " fmt - Format code" + @echo " lint - Run linters" + @echo " dist - Build binaries for all platforms" + @echo " release - Create release tarballs" + +# Check Go version +check-go-version: + @go version | grep -q "go$(GO_VERSION)" || (echo "Go $(GO_VERSION) is required" && exit 1) + +# Dependencies +deps: check-go-version + go mod tidy + +# Build +build: check-go-version deps + echo "Building $(BINARY_NAME)" + go build -ldflags "$(LDFLAGS)" -o $(BINARY_NAME) + +# Install +install: check-go-version deps + echo "Installing $(BINARY_NAME)" + go install -ldflags "$(LDFLAGS)" + +# Clean +clean: + rm -f $(BINARY_NAME) + rm -rf dist + rm -f minica-*.tar.gz + +# Format +fmt: check-go-version + go fmt ./... + +# Lint +lint: check-go-version deps + go vet ./... + +# Distribution +dist-clean: + rm -rf dist + rm -f minica-*.tar.gz + +dist: check-go-version deps dist-clean + mkdir -p dist/alpine-linux/amd64 && GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -a -tags netgo -installsuffix netgo -o dist/alpine-linux/amd64/minica + mkdir -p dist/alpine-linux/ppc64le && GOOS=linux GOARCH=ppc64le go build -ldflags "$(LDFLAGS)" -a -tags netgo -installsuffix netgo -o dist/alpine-linux/ppc64le/minica + mkdir -p dist/linux/amd64 && GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o dist/linux/amd64/minica + mkdir -p dist/linux/386 && GOOS=linux GOARCH=386 go build -ldflags "$(LDFLAGS)" -o dist/linux/386/minica + mkdir -p dist/linux/armel && GOOS=linux GOARCH=arm GOARM=5 go build -ldflags "$(LDFLAGS)" -o dist/linux/armel/minica + mkdir -p dist/linux/armhf && GOOS=linux GOARCH=arm GOARM=6 go build -ldflags "$(LDFLAGS)" -o dist/linux/armhf/minica + mkdir -p dist/linux/arm64 && GOOS=linux GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o dist/linux/arm64/minica + mkdir -p dist/linux/ppc64le && GOOS=linux GOARCH=ppc64le go build -ldflags "$(LDFLAGS)" -o dist/linux/ppc64le/minica + mkdir -p dist/darwin/amd64 && GOOS=darwin GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o dist/darwin/amd64/minica + mkdir -p dist/darwin/arm64 && GOOS=darwin GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o dist/darwin/arm64/minica + mkdir -p dist/linux/s390x && GOOS=linux GOARCH=s390x go build -ldflags "$(LDFLAGS)" -o dist/linux/s390x/minica + +# Release +release: dist + tar -cvzf minica-alpine-linux-amd64-$(TAG).tar.gz -C dist/alpine-linux/amd64 minica + tar -cvzf minica-alpine-linux-ppc64le-$(TAG).tar.gz -C dist/alpine-linux/ppc64le minica + tar -cvzf minica-linux-amd64-$(TAG).tar.gz -C dist/linux/amd64 minica + tar -cvzf minica-linux-386-$(TAG).tar.gz -C dist/linux/386 minica + tar -cvzf minica-linux-armel-$(TAG).tar.gz -C dist/linux/armel minica + tar -cvzf minica-linux-armhf-$(TAG).tar.gz -C dist/linux/armhf minica + tar -cvzf minica-linux-arm64-$(TAG).tar.gz -C dist/linux/arm64 minica + tar -cvzf minica-linux-ppc64le-$(TAG).tar.gz -C dist/linux/ppc64le minica + tar -cvzf minica-darwin-amd64-$(TAG).tar.gz -C dist/darwin/amd64 minica + tar -cvzf minica-darwin-arm64-$(TAG).tar.gz -C dist/darwin/arm64 minica + tar -cvzf minica-linux-s390x-$(TAG).tar.gz -C dist/linux/s390x minica + +# Alias for build +all: build \ No newline at end of file From 27290d807550a5f09ade9fc920ae9384744ac0f5 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 3 Jun 2025 10:32:42 +0530 Subject: [PATCH 3/4] added codeowners --- CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..9593133 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,2 @@ +* @astronomer/astronomer-software +* @astronomer/maintainers-astronomer From f01d43cc26a5fc946998f4735d4e1e982ca02720 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 3 Jun 2025 10:34:52 +0530 Subject: [PATCH 4/4] added codeowners --- CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 9593133..00ed351 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ -* @astronomer/astronomer-software -* @astronomer/maintainers-astronomer +* @astronomer/astronomer-software +* @astronomer/maintainers-astronomer