remove pkg directory and update refs (#48)

Signed-off-by: Colin Douglas <[email protected]>
chainguard-dev · Nov 27, 2023 · 10878a1 · 10878a1
1 parent 1930296
commit 10878a1
Show file tree

Hide file tree

Showing 65 changed files with 66 additions and 66 deletions.
diff --git a/pkg/auth/aws/e2e_test.go → auth/aws/e2e_test.go b/pkg/auth/aws/e2e_test.go → auth/aws/e2e_test.go
diff --git a/pkg/auth/aws/generate.go → auth/aws/generate.go b/pkg/auth/aws/generate.go → auth/aws/generate.go
diff --git a/pkg/auth/aws/verify.go → auth/aws/verify.go b/pkg/auth/aws/verify.go → auth/aws/verify.go
diff --git a/pkg/auth/aws/verify_options.go → auth/aws/verify_options.go b/pkg/auth/aws/verify_options.go → auth/aws/verify_options.go
diff --git a/pkg/auth/context.go → auth/context.go b/pkg/auth/context.go → auth/context.go
diff --git a/pkg/auth/file.go → auth/file.go b/pkg/auth/file.go → auth/file.go
diff --git a/pkg/auth/login/html.go → auth/login/html.go b/pkg/auth/login/html.go → auth/login/html.go
diff --git a/pkg/auth/login/login.go → auth/login/login.go b/pkg/auth/login/login.go → auth/login/login.go
diff --git a/pkg/auth/login/options.go → auth/login/options.go b/pkg/auth/login/options.go → auth/login/options.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"fmt"
 
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 )
 
 type config struct {

diff --git a/pkg/auth/login/options_test.go → auth/login/options_test.go b/pkg/auth/login/options_test.go → auth/login/options_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/pkg/auth/login/orgcheck.go → auth/login/orgcheck.go b/pkg/auth/login/orgcheck.go → auth/login/orgcheck.go
diff --git a/pkg/auth/login/orgcheck_test.go → auth/login/orgcheck_test.go b/pkg/auth/login/orgcheck_test.go → auth/login/orgcheck_test.go
diff --git a/pkg/auth/login/server.go → auth/login/server.go b/pkg/auth/login/server.go → auth/login/server.go
diff --git a/pkg/auth/login/server_test.go → auth/login/server_test.go b/pkg/auth/login/server_test.go → auth/login/server_test.go
diff --git a/pkg/auth/oidc.go → auth/oidc.go b/pkg/auth/oidc.go → auth/oidc.go
diff --git a/pkg/auth/token.go → auth/token.go b/pkg/auth/token.go → auth/token.go
diff --git a/pkg/auth/token/token.go → auth/token/token.go b/pkg/auth/token/token.go → auth/token/token.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"chainguard.dev/sdk/pkg/auth"
+	"chainguard.dev/sdk/auth"
 )
 
 var (

diff --git a/pkg/auth/token/token_test.go → auth/token/token_test.go b/pkg/auth/token/token_test.go → auth/token/token_test.go
diff --git a/pkg/civil/civil.go → civil/civil.go b/pkg/civil/civil.go → civil/civil.go
diff --git a/pkg/civil/civil_test.go → civil/civil_test.go b/pkg/civil/civil_test.go → civil/civil_test.go
diff --git a/pkg/events/admission/admission.go → events/admission/admission.go b/pkg/events/admission/admission.go → events/admission/admission.go
diff --git a/pkg/events/admission/namespace.go → events/admission/namespace.go b/pkg/events/admission/namespace.go → events/admission/namespace.go
@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 package admission
 
 import (
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 )
 
 // NamespaceEventType is the cloudevents event type when a namespace's scope

diff --git a/pkg/events/extensions.go → events/extensions.go b/pkg/events/extensions.go → events/extensions.go
diff --git a/pkg/events/occurrence.go → events/occurrence.go b/pkg/events/occurrence.go → events/occurrence.go
diff --git a/pkg/events/policy/policy.go → events/policy/policy.go b/pkg/events/policy/policy.go → events/policy/policy.go
diff --git a/pkg/events/receiver/receiver.go → events/receiver/receiver.go b/pkg/events/receiver/receiver.go → events/receiver/receiver.go
diff --git a/pkg/events/registry/registry.go → events/registry/registry.go b/pkg/events/registry/registry.go → events/registry/registry.go
@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
 
 package registry
 
-import "chainguard.dev/sdk/pkg/civil"
+import "chainguard.dev/sdk/civil"
 
 const (
 	// PulledEventType is the cloudevents event type for registry pulls

diff --git a/pkg/policy/parse.go → policy/parse.go b/pkg/policy/parse.go → policy/parse.go
diff --git a/pkg/policy/parse_test.go → policy/parse_test.go b/pkg/policy/parse_test.go → policy/parse_test.go
diff --git a/pkg/policy/validate.go → policy/validate.go b/pkg/policy/validate.go → policy/validate.go
diff --git a/pkg/policy/validate_test.go → policy/validate_test.go b/pkg/policy/validate_test.go → policy/validate_test.go
diff --git a/proto/platform/advisory/v1/clients.go b/proto/platform/advisory/v1/clients.go
@@ -15,7 +15,7 @@ import (
 	"google.golang.org/grpc"
 	"knative.dev/pkg/logging"
 
-	"chainguard.dev/sdk/pkg/auth"
+	"chainguard.dev/sdk/auth"
 )
 
 type Clients interface {

diff --git a/proto/platform/auth/v1/auth.platform.event.go b/proto/platform/auth/v1/auth.platform.event.go
@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
 
 package v1
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *Session) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -15,7 +15,7 @@ func (x *Session) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *Session) CloudEventsSubject() string {
 	return ""
 }
diff --git a/proto/platform/events/v1/identities.platform.event.go b/proto/platform/events/v1/identities.platform.event.go
@@ -5,12 +5,12 @@ SPDX-License-Identifier: Apache-2.0
 
 package v1
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *IdentityMetadata) CloudEventsExtension(key string) (string, bool) { //nolint: revive
 	return "", false
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *IdentityMetadata) CloudEventsSubject() string {
 	return ""
 }
diff --git a/proto/platform/events/v1/subscriptions.platform.event.go b/proto/platform/events/v1/subscriptions.platform.event.go
@@ -6,10 +6,10 @@ SPDX-License-Identifier: Apache-2.0
 package v1
 
 import (
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 )
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *Subscription) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -19,12 +19,12 @@ func (x *Subscription) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *Subscription) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *DeleteSubscriptionRequest) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -34,12 +34,12 @@ func (x *DeleteSubscriptionRequest) CloudEventsExtension(key string) (string, bo
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *DeleteSubscriptionRequest) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsRedact implements chainguard.dev/sdk/pkg/events/Redactable.Redact.
+// CloudEventsRedact implements chainguard.dev/sdk/events/Redactable.Redact.
 func (x *DeleteSubscriptionRequest) CloudEventsRedact() interface{} {
 	return nil
 }
diff --git a/proto/platform/iam/v1/account_associations.platform.event.go b/proto/platform/iam/v1/account_associations.platform.event.go
@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
 
 package v1
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *AccountAssociations) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -15,12 +15,12 @@ func (x *AccountAssociations) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *AccountAssociations) CloudEventsSubject() string {
 	return x.Group
 }
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *DeleteAccountAssociationsRequest) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -30,12 +30,12 @@ func (x *DeleteAccountAssociationsRequest) CloudEventsExtension(key string) (str
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *DeleteAccountAssociationsRequest) CloudEventsSubject() string {
 	return x.Group
 }
 
-// CloudEventsRedact implements chainguard.dev/sdk/pkg/events/Redactable.Redact.
+// CloudEventsRedact implements chainguard.dev/sdk/events/Redactable.Redact.
 func (x *DeleteAccountAssociationsRequest) CloudEventsRedact() interface{} {
 	return nil
 }
diff --git a/proto/platform/iam/v1/clients.go b/proto/platform/iam/v1/clients.go
@@ -15,7 +15,7 @@ import (
 	"google.golang.org/grpc"
 	"knative.dev/pkg/logging"
 
-	"chainguard.dev/sdk/pkg/auth"
+	"chainguard.dev/sdk/auth"
 	events "chainguard.dev/sdk/proto/platform/events/v1"
 )
 

diff --git a/proto/platform/iam/v1/group.platform.event.go b/proto/platform/iam/v1/group.platform.event.go
@@ -5,9 +5,9 @@ SPDX-License-Identifier: Apache-2.0
 
 package v1
 
-import "chainguard.dev/sdk/pkg/uidp"
+import "chainguard.dev/sdk/uidp"
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *Group) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -17,12 +17,12 @@ func (x *Group) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *Group) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *DeleteGroupRequest) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -32,7 +32,7 @@ func (x *DeleteGroupRequest) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *DeleteGroupRequest) CloudEventsSubject() string {
 	return x.GetId()
 }
diff --git a/proto/platform/iam/v1/group_invites.platform.event.go b/proto/platform/iam/v1/group_invites.platform.event.go
@@ -6,10 +6,10 @@ SPDX-License-Identifier: Apache-2.0
 package v1
 
 import (
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 )
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *GroupInvite) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -19,20 +19,20 @@ func (x *GroupInvite) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *GroupInvite) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsRedact implements chainguard.dev/sdk/pkg/events/Redactable.CloudEventsRedact.
+// CloudEventsRedact implements chainguard.dev/sdk/events/Redactable.CloudEventsRedact.
 func (x *GroupInvite) CloudEventsRedact() interface{} {
 	return &GroupInvite{
 		Id:         x.Id,
 		Expiration: x.Expiration,
 	}
 }
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *DeleteGroupInviteRequest) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -42,7 +42,7 @@ func (x *DeleteGroupInviteRequest) CloudEventsExtension(key string) (string, boo
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *DeleteGroupInviteRequest) CloudEventsSubject() string {
 	return x.GetId()
 }
diff --git a/proto/platform/iam/v1/identity.platform.event.go b/proto/platform/iam/v1/identity.platform.event.go
@@ -6,10 +6,10 @@ SPDX-License-Identifier: Apache-2.0
 package v1
 
 import (
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 )
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *Identity) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -19,12 +19,12 @@ func (x *Identity) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *Identity) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *DeleteIdentityRequest) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -34,7 +34,7 @@ func (x *DeleteIdentityRequest) CloudEventsExtension(key string) (string, bool)
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *DeleteIdentityRequest) CloudEventsSubject() string {
 	return x.GetId()
 }
diff --git a/proto/platform/iam/v1/identity_providers.platform.event.go b/proto/platform/iam/v1/identity_providers.platform.event.go
@@ -6,10 +6,10 @@ SPDX-License-Identifier: Apache-2.0
 package v1
 
 import (
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 )
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *IdentityProvider) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -19,12 +19,12 @@ func (x *IdentityProvider) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *IdentityProvider) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *DeleteIdentityProviderRequest) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -34,7 +34,7 @@ func (x *DeleteIdentityProviderRequest) CloudEventsExtension(key string) (string
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *DeleteIdentityProviderRequest) CloudEventsSubject() string {
 	return x.GetId()
 }
diff --git a/proto/platform/iam/v1/policies.platform.event.go b/proto/platform/iam/v1/policies.platform.event.go
@@ -6,10 +6,10 @@ SPDX-License-Identifier: Apache-2.0
 package v1
 
 import (
-	"chainguard.dev/sdk/pkg/uidp"
+	"chainguard.dev/sdk/uidp"
 )
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *Policy) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -19,12 +19,12 @@ func (x *Policy) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *Policy) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *DeletePolicyRequest) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -34,12 +34,12 @@ func (x *DeletePolicyRequest) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *DeletePolicyRequest) CloudEventsSubject() string {
 	return x.GetId()
 }
 
-// CloudEventsRedact implements chainguard.dev/sdk/pkg/events/Redactable.Redact.
+// CloudEventsRedact implements chainguard.dev/sdk/events/Redactable.Redact.
 func (x *DeletePolicyRequest) CloudEventsRedact() interface{} {
 	return nil
 }
diff --git a/proto/platform/iam/v1/role.platform.event.go b/proto/platform/iam/v1/role.platform.event.go
@@ -5,9 +5,9 @@ SPDX-License-Identifier: Apache-2.0
 
 package v1
 
-import "chainguard.dev/sdk/pkg/uidp"
+import "chainguard.dev/sdk/uidp"
 
-// CloudEventsExtension implements chainguard.dev/sdk/pkg/events/Extendable.CloudEventsExtension
+// CloudEventsExtension implements chainguard.dev/sdk/events/Extendable.CloudEventsExtension
 func (x *Role) CloudEventsExtension(key string) (string, bool) {
 	switch key {
 	case "group":
@@ -17,7 +17,7 @@ func (x *Role) CloudEventsExtension(key string) (string, bool) {
 	}
 }
 
-// CloudEventsSubject implements chainguard.dev/sdk/pkg/events/Eventable.CloudEventsSubject.
+// CloudEventsSubject implements chainguard.dev/sdk/events/Eventable.CloudEventsSubject.
 func (x *Role) CloudEventsSubject() string {
 	return x.GetId()
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     	"strings"
     	"time"
-    	"chainguard.dev/sdk/pkg/auth"
+    	"chainguard.dev/sdk/auth"
     )
     var (
@@ Expand Down @@