refactor: move api/util to ../shared/

argoproj-labs · May 13, 2021 · 99bfd15 · 99bfd15
1 parent e26c3a9
commit 99bfd15
Show file tree

Hide file tree

Showing 29 changed files with 23 additions and 21 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,6 +1,6 @@
 ignore:
   - .github
-  - api/util/containerkiller/container_killer.go
+  - shared/util/containerkiller/container_killer.go
   - api/v1alpha1/generated.pb.go
   - api/v1alpha1/zz_generated.deepcopy.go
   - config

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
     needs: [ test ]
     steps:
       - uses: actions/checkout@v2
-      - run: touch api/util/message
+      - run: touch shared/util/message
       - uses: golangci/golangci-lint-action@v2
         with:
           version: v1.36.0

diff --git a/Dockerfile b/Dockerfile
@@ -13,8 +13,9 @@ RUN --mount=type=cache,target=/go/pkg/mod go mod download
 FROM builder AS controller-builder
 COPY .git/ .git/
 COPY api/ api/
+COPY shared/ shared/
 COPY manager/ manager/
-RUN go generate ./api/util/version.go
+RUN go generate ./shared/util/version.go
 RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 go build -a -o bin/manager ./manager
 
 FROM gcr.io/distroless/static:nonroot AS controller
@@ -28,8 +29,9 @@ ENTRYPOINT ["/manager"]
 FROM builder AS runner-builder
 COPY .git/ .git/
 COPY api/ api/
+COPY shared/ shared/
 COPY runner/ runner/
-RUN go generate ./api/util/version.go
+RUN go generate ./shared/util/version.go
 RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 go build -a -o bin/runner ./runner
 COPY kill/ kill/
 RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 go build -a -o bin/kill ./kill

diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ build: generate manifests
 	go build ./...
 
 # Run tests
-test: api/util/message
+test: shared/util/message
 	go test -v ./... -coverprofile cover.out
 
 pre-commit: codegen test install lint
@@ -96,7 +96,7 @@ api/v1alpha1/generated.%: $(shell find api/v1alpha1 -type f -name '*.go' -not -n
 	mv api/v1alpha1/groupversion_info.go.0 api/v1alpha1/groupversion_info.go
 	go mod tidy
 
-lint: api/util/message
+lint: shared/util/message
 	go mod tidy
 	golangci-lint run --fix
 	kubectl apply --dry-run=client -f docs/examples
@@ -126,7 +126,7 @@ scan-%:
 changelog:
 	git log --oneline -n10 > changelog
 
-$(GOBIN)/controller-gen: api/util/message
+$(GOBIN)/controller-gen: shared/util/message
 	go install sigs.k8s.io/controller-tools/cmd/[email protected]
 
 version:=2.3.2
@@ -150,11 +150,11 @@ config/nats/single-server-nats.yml:
 config/stan/single-server-stan.yml:
 	curl -o config/stan/single-server-stan.yml https://raw.githubusercontent.com/nats-io/k8s/v0.7.4/nats-streaming-server/single-server-stan.yml
 
-api/util/message:
-	touch api/util/message
+shared/util/message:
+	touch shared/util/message
 
 .PHONY: test-examples
-test-examples: api/util/message
+test-examples: shared/util/message
 	go test -timeout 20m -v -tags examples -count 1 ./docs/examples
 
 argocli:

diff --git a/api/v1alpha1/step_spec.go b/api/v1alpha1/step_spec.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/utils/pointer"
 )

diff --git a/docs/examples/examples_test.go b/docs/examples/examples_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/docs/examples/main.go b/docs/examples/main.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/manager/controllers/bus/installer.go b/manager/controllers/bus/installer.go
@@ -10,7 +10,7 @@ import (
 
 	"k8s.io/client-go/rest"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/manager/controllers/config.go b/manager/controllers/config.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"

diff --git a/manager/controllers/pipeline_controller.go b/manager/controllers/pipeline_controller.go
@@ -31,7 +31,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 	"github.com/argoproj-labs/argo-dataflow/manager/controllers/bus"
 	"github.com/argoproj-labs/argo-dataflow/shared/containerkiller"

diff --git a/manager/controllers/step_controller.go b/manager/controllers/step_controller.go
@@ -32,7 +32,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 	"github.com/argoproj-labs/argo-dataflow/shared/containerkiller"
 )

diff --git a/runner/group/group.go b/runner/group/group.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"sort"
 
-	util2 "github.com/argoproj-labs/argo-dataflow/api/util"
+	util2 "github.com/argoproj-labs/argo-dataflow/shared/util"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 	"github.com/argoproj-labs/argo-dataflow/runner/util"
 

diff --git a/runner/init/init.go b/runner/init/init.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	util2 "github.com/argoproj-labs/argo-dataflow/api/util"
+	util2 "github.com/argoproj-labs/argo-dataflow/shared/util"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"

diff --git a/runner/sidecar/sidecar.go b/runner/sidecar/sidecar.go
@@ -25,7 +25,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	apiutil "github.com/argoproj-labs/argo-dataflow/api/util"
+	apiutil "github.com/argoproj-labs/argo-dataflow/shared/util"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 	"github.com/argoproj-labs/argo-dataflow/runner/util"
 )

diff --git a/shared/containerkiller/container_killer.go b/shared/containerkiller/container_killer.go
@@ -10,7 +10,7 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	"github.com/argoproj-labs/argo-dataflow/api/util"
+	"github.com/argoproj-labs/argo-dataflow/shared/util"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
 )
 

diff --git a/api/util/.gitignore → shared/util/.gitignore b/api/util/.gitignore → shared/util/.gitignore
diff --git a/api/util/env.go → shared/util/env.go b/api/util/env.go → shared/util/env.go
diff --git a/api/util/env_test.go → shared/util/env_test.go b/api/util/env_test.go → shared/util/env_test.go
diff --git a/api/util/equal.go → shared/util/equal.go b/api/util/equal.go → shared/util/equal.go
diff --git a/api/util/error.go → shared/util/error.go b/api/util/error.go → shared/util/error.go
diff --git a/api/util/hash.go → shared/util/hash.go b/api/util/hash.go → shared/util/hash.go
diff --git a/api/util/hash_test.go → shared/util/hash_test.go b/api/util/hash_test.go → shared/util/hash_test.go
diff --git a/api/util/io.go → shared/util/io.go b/api/util/io.go → shared/util/io.go
diff --git a/api/util/json.go → shared/util/json.go b/api/util/json.go → shared/util/json.go
diff --git a/api/util/json_test.go → shared/util/json_test.go b/api/util/json_test.go → shared/util/json_test.go
diff --git a/api/util/print.go → shared/util/print.go b/api/util/print.go → shared/util/print.go
diff --git a/api/util/process.go → shared/util/process.go b/api/util/process.go → shared/util/process.go
diff --git a/api/util/resource.go → shared/util/resource.go b/api/util/resource.go → shared/util/resource.go
diff --git a/api/util/version.go → shared/util/version.go b/api/util/version.go → shared/util/version.go