refactor: move some directories around

tronghn · tronghn · commit b82a8d7c5308 · 2020-05-06T09:14:38.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -23,5 +23,4 @@ bin
 *.swo
 *~
 
-cmd/azurerator/azurerator
 azurerator.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -11,8 +11,8 @@ RUN go mod download
 
 # Copy the go source
 COPY main.go main.go
-COPY pkg/apis api/
-COPY pkg/controllers controllers/
+COPY apis api/
+COPY controllers controllers/
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ test: generate fmt vet manifests
 
 # Build manager binary
 manager: generate fmt vet
-	cd cmd/azurerator && go build
+	go build -o bin/azurerator cmd/azurerator/main.go
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 run: generate fmt vet manifests
diff --git a/apis/v1alpha1/azureadapplication_types.go b/apis/v1alpha1/azureadapplication_types.go
diff --git a/apis/v1alpha1/groupversion_info.go b/apis/v1alpha1/groupversion_info.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/azurerator/main.go b/cmd/azurerator/main.go
@@ -5,17 +5,17 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/nais/azureator/controllers/azureadapplication"
 	"github.com/nais/azureator/pkg/azure"
 	"github.com/nais/azureator/pkg/azure/client"
 	"github.com/nais/azureator/pkg/config"
-	"github.com/nais/azureator/pkg/controllers/azureadapplication"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -9,7 +9,7 @@ rules:
 - apiGroups:
   - nais.io
   resources:
-  - azureadapplications
+  - AzureAdApplications
   verbs:
   - create
   - delete
@@ -21,7 +21,7 @@ rules:
 - apiGroups:
   - nais.io
   resources:
-  - azureadapplications/status
+  - AzureAdApplications/status
   verbs:
   - get
   - patch
diff --git a/controllers/azureadapplication/azureadapplication_controller.go b/controllers/azureadapplication/azureadapplication_controller.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -21,10 +21,6 @@ type Reconciler struct {
 	ClusterName string
 }
 
-type Transaction struct {
-
-}
-
 var log logr.Logger
 
 // +kubebuilder:rbac:groups=nais.io,resources=AzureAdApplications,verbs=get;list;watch;create;update;patch;delete
diff --git a/controllers/azureadapplication/create.go b/controllers/azureadapplication/create.go
@@ -3,7 +3,7 @@ package azureadapplication
 import (
 	"context"
 
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 )
 
diff --git a/controllers/azureadapplication/delete.go b/controllers/azureadapplication/delete.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 )
 
 // Clean up / delete all associated resources, both internal and external
diff --git a/controllers/azureadapplication/finalizer.go b/controllers/azureadapplication/finalizer.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/util"
 )
 
diff --git a/controllers/azureadapplication/helpers.go b/controllers/azureadapplication/helpers.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 )
 
 func (r *Reconciler) updateStatusSubresource(ctx context.Context, resource *naisiov1alpha1.AzureAdApplication) error {
diff --git a/controllers/azureadapplication/resources.go b/controllers/azureadapplication/resources.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 	"github.com/nais/azureator/pkg/resourcecreator"
 	"github.com/nais/azureator/pkg/resourcecreator/configmap"
diff --git a/controllers/azureadapplication/update.go b/controllers/azureadapplication/update.go
@@ -3,7 +3,7 @@ package azureadapplication
 import (
 	"context"
 
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 )
 
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -14,7 +14,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"
+	naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 
diff --git a/pkg/azure/client/application.go b/pkg/azure/client/application.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure/util"
 	"github.com/nais/azureator/pkg/util/crypto"
 	"github.com/yaegashi/msgraph.go/ptr"
diff --git a/pkg/azure/client/client.go b/pkg/azure/client/client.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 	"github.com/nais/azureator/pkg/azure/util"
 	msgraphbeta "github.com/yaegashi/msgraph.go/beta"
diff --git a/pkg/azure/client/keycredential.go b/pkg/azure/client/keycredential.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure/util"
 	"github.com/nais/azureator/pkg/util/crypto"
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
diff --git a/pkg/azure/client/passwordcredential.go b/pkg/azure/client/passwordcredential.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/yaegashi/msgraph.go/ptr"
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
 )
diff --git a/pkg/azure/client/preauthorizedapp.go b/pkg/azure/client/preauthorizedapp.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
 )
 
diff --git a/pkg/azure/client/serviceprincipal.go b/pkg/azure/client/serviceprincipal.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure/util"
 	msgraphbeta "github.com/yaegashi/msgraph.go/beta"
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
diff --git a/pkg/azure/models.go b/pkg/azure/models.go
@@ -3,7 +3,7 @@ package azure
 import (
 	"context"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
 	"gopkg.in/square/go-jose.v2"
 )
diff --git a/pkg/azure/util/application.go b/pkg/azure/util/application.go
@@ -1,7 +1,7 @@
 package util
 
 import (
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
 )
 
diff --git a/pkg/azure/util/credentials.go b/pkg/azure/util/credentials.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/util/crypto"
 	"github.com/yaegashi/msgraph.go/ptr"
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
diff --git a/pkg/azure/util/strings.go b/pkg/azure/util/strings.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 )
 
 func GetReplyUrlsStringSlice(resource v1alpha1.AzureAdApplication) []string {
diff --git a/pkg/resourcecreator/configmap/configmap.go b/pkg/resourcecreator/configmap/configmap.go
@@ -3,7 +3,7 @@ package configmap
 import (
 	"fmt"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 	"github.com/nais/azureator/pkg/resourcecreator"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/resourcecreator/resourcecreator.go b/pkg/resourcecreator/resourcecreator.go
@@ -1,7 +1,7 @@
 package resourcecreator
 
 import (
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/resourcecreator/secret/secret.go b/pkg/resourcecreator/secret/secret.go
@@ -3,7 +3,7 @@ package secret
 import (
 	"fmt"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"github.com/nais/azureator/pkg/azure"
 	"github.com/nais/azureator/pkg/resourcecreator"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/util/crypto/certificate.go b/pkg/util/crypto/certificate.go
@@ -9,7 +9,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 )
 
 func GenerateCertificate(template *x509.Certificate, keyPair KeyPair) (*x509.Certificate, error) {
diff --git a/pkg/util/crypto/jwk.go b/pkg/util/crypto/jwk.go
@@ -6,7 +6,7 @@ import (
 	"crypto/x509"
 	"encoding/base64"
 
-	"github.com/nais/azureator/pkg/apis/v1alpha1"
+	"github.com/nais/azureator/apis/v1alpha1"
 	"gopkg.in/square/go-jose.v2"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package azureadapplication`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`6`	`+ naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"`
`7`	`7`	`"github.com/nais/azureator/pkg/azure"`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`7`	`+ naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Clean up / delete all associated resources, both internal and external`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`logf "sigs.k8s.io/controller-runtime/pkg/log"`
`15`	`15`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`16`	`16`
`17`		`- naisiov1alpha1 "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`17`	`+ naisiov1alpha1 "github.com/nais/azureator/apis/v1alpha1"`
`18`	`18`	`// +kubebuilder:scaffold:imports`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"time"`
`7`	`7`
`8`	`8`	`"github.com/google/uuid"`
`9`		`- "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`9`	`+ "github.com/nais/azureator/apis/v1alpha1"`
`10`	`10`	`"github.com/yaegashi/msgraph.go/ptr"`
`11`	`11`	`msgraph "github.com/yaegashi/msgraph.go/v1.0"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`
`7`	`7`	`"github.com/google/uuid"`
`8`		`- "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`8`	`+ "github.com/nais/azureator/apis/v1alpha1"`
`9`	`9`	`msgraph "github.com/yaegashi/msgraph.go/v1.0"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package azure`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`6`	`+ "github.com/nais/azureator/apis/v1alpha1"`
`7`	`7`	`msgraph "github.com/yaegashi/msgraph.go/v1.0"`
`8`	`8`	`"gopkg.in/square/go-jose.v2"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package util`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`4`	`+ "github.com/nais/azureator/apis/v1alpha1"`
`5`	`5`	`msgraph "github.com/yaegashi/msgraph.go/v1.0"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"strings"`
`6`	`6`
`7`		`- "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`7`	`+ "github.com/nais/azureator/apis/v1alpha1"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func GetReplyUrlsStringSlice(resource v1alpha1.AzureAdApplication) []string {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"math/big"`
`10`	`10`	`"time"`
`11`	`11`
`12`		`- "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`12`	`+ "github.com/nais/azureator/apis/v1alpha1"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func GenerateCertificate(template x509.Certificate, keyPair KeyPair) (x509.Certificate, error) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"crypto/x509"`
`7`	`7`	`"encoding/base64"`
`8`	`8`
`9`		`- "github.com/nais/azureator/pkg/apis/v1alpha1"`
	`9`	`+ "github.com/nais/azureator/apis/v1alpha1"`
`10`	`10`	`"gopkg.in/square/go-jose.v2"`
`11`	`11`	`)`
`12`	`12`