move TenantID into types package

Author: lionello

src/cmd/cli/main.go

@@ -26,7 +26,8 @@ import (
 	"github.com/defang-io/defang/src/pkg"
 	"github.com/defang-io/defang/src/pkg/cli"
 	"github.com/defang-io/defang/src/pkg/scope"
-	defangv1 "github.com/defang-io/defang/src/protos/io/defang/v1"
+	"github.com/defang-io/defang/src/pkg/types"
+	v1 "github.com/defang-io/defang/src/protos/io/defang/v1"
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 )
 
@@ -41,7 +42,7 @@ var (
 	hasTty         = term.IsTerminal(int(os.Stdin.Fd())) && !pkg.GetenvBool("CI")
 	nonInteractive bool   // set by the --non-interactive flag
 	server         string // set by the --cluster flag
-	tenantId       = pkg.DEFAULT_TENANT
+	tenantId       = types.DEFAULT_TENANT
 )
 
 const autoConnect = "auto-connect" // annotation to indicate that a command needs to connect to the cluster
@@ -380,15 +381,15 @@ var composeCmd = &cobra.Command{
 	Short:   "Work with local Compose files",
 }
 
-func printEndpoints(serviceInfos []*defangv1.ServiceInfo) {
+func printEndpoints(serviceInfos []*v1.ServiceInfo) {
 	for _, serviceInfo := range serviceInfos {
 		andEndpoints := ""
 		if len(serviceInfo.Endpoints) > 0 {
 			andEndpoints = "and will be available at:"
 		}
 		cli.Info(" * Service", serviceInfo.Service.Name, "is in state", serviceInfo.Status, andEndpoints)
 		for i, endpoint := range serviceInfo.Endpoints {
-			if serviceInfo.Service.Ports[i].Mode == defangv1.Mode_INGRESS {
+			if serviceInfo.Service.Ports[i].Mode == v1.Mode_INGRESS {
 				endpoint = "https://" + endpoint
 			}
 			fmt.Println("   -", endpoint)
@@ -592,7 +593,7 @@ var tokenCmd = &cobra.Command{
 		var expires, _ = cmd.Flags().GetDuration("expires")
 
 		// TODO: should default to use the current tenant, not the default tenant
-		return cli.Token(cmd.Context(), client, clientId, pkg.DEFAULT_TENANT, expires, scope.Scope(s))
+		return cli.Token(cmd.Context(), client, clientId, types.DEFAULT_TENANT, expires, scope.Scope(s))
 	},
 }
 

src/pkg/cli/compose.go

@@ -22,7 +22,7 @@ import (
 	"github.com/bufbuild/connect-go"
 	"github.com/compose-spec/compose-go/v2/loader"
 	"github.com/compose-spec/compose-go/v2/types"
-	pb "github.com/defang-io/defang/src/protos/io/defang/v1"
+	v1 "github.com/defang-io/defang/src/protos/io/defang/v1"
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 	"github.com/moby/patternmatcher"
 	"github.com/moby/patternmatcher/ignorefile"
@@ -80,17 +80,17 @@ func resolveEnv(k string) *string {
 	return &v
 }
 
-func convertPlatform(platform string) pb.Platform {
+func convertPlatform(platform string) v1.Platform {
 	switch platform {
 	default:
 		logrus.Warnf("Unsupported platform: %q (assuming linux)", platform)
 		fallthrough
 	case "", "linux":
-		return pb.Platform_LINUX_ANY
+		return v1.Platform_LINUX_ANY
 	case "linux/amd64":
-		return pb.Platform_LINUX_AMD64
+		return v1.Platform_LINUX_AMD64
 	case "linux/arm64", "linux/arm64/v8", "linux/arm64/v7", "linux/arm64/v6":
-		return pb.Platform_LINUX_ARM64
+		return v1.Platform_LINUX_ARM64
 	}
 }
 
@@ -152,7 +152,7 @@ func getRemoteBuildContext(ctx context.Context, client defangv1connect.FabricCon
 	return uploadTarball(ctx, client, buffer, digest)
 }
 
-func convertPort(port types.ServicePortConfig) (*pb.Port, error) {
+func convertPort(port types.ServicePortConfig) (*v1.Port, error) {
 	if port.Target < 1 || port.Target > 32767 {
 		return nil, fmt.Errorf("port target must be an integer between 1 and 32767: %v", port.Target)
 	}
@@ -163,7 +163,7 @@ func convertPort(port types.ServicePortConfig) (*pb.Port, error) {
 		return nil, fmt.Errorf("port published must be empty or equal to target: %v", port.Published)
 	}
 
-	pbPort := &pb.Port{
+	pbPort := &v1.Port{
 		// Mode      string `yaml:",omitempty" json:"mode,omitempty"`
 		// HostIP    string `mapstructure:"host_ip" yaml:"host_ip,omitempty" json:"host_ip,omitempty"`
 		// Published string `yaml:",omitempty" json:"published,omitempty"`
@@ -173,17 +173,17 @@ func convertPort(port types.ServicePortConfig) (*pb.Port, error) {
 
 	switch port.Protocol {
 	case "":
-		pbPort.Protocol = pb.Protocol_ANY // defaults to HTTP in CD
+		pbPort.Protocol = v1.Protocol_ANY // defaults to HTTP in CD
 	case "tcp":
-		pbPort.Protocol = pb.Protocol_TCP
+		pbPort.Protocol = v1.Protocol_TCP
 	case "udp":
-		pbPort.Protocol = pb.Protocol_UDP
+		pbPort.Protocol = v1.Protocol_UDP
 	case "http": // TODO: not per spec
-		pbPort.Protocol = pb.Protocol_HTTP
+		pbPort.Protocol = v1.Protocol_HTTP
 	case "http2": // TODO: not per spec
-		pbPort.Protocol = pb.Protocol_HTTP2
+		pbPort.Protocol = v1.Protocol_HTTP2
 	case "grpc": // TODO: not per spec
-		pbPort.Protocol = pb.Protocol_GRPC
+		pbPort.Protocol = v1.Protocol_GRPC
 	default:
 		return nil, fmt.Errorf("port protocol not one of [tcp udp http http2 grpc]: %v", port.Protocol)
 	}
@@ -195,26 +195,26 @@ func convertPort(port types.ServicePortConfig) (*pb.Port, error) {
 		logrus.Warn("No port mode was specified; assuming 'host' (add 'mode' to silence)")
 		fallthrough
 	case "host":
-		pbPort.Mode = pb.Mode_HOST
+		pbPort.Mode = v1.Mode_HOST
 	case "ingress":
 		// This code is unnecessarily complex because compose-go silently converts short syntax to ingress+tcp
 		if port.Published != "" {
 			logrus.Warn("Published ports are not supported in ingress mode; assuming 'host' (add 'mode' to silence)")
 			break
 		}
-		pbPort.Mode = pb.Mode_INGRESS
-		if pbPort.Protocol == pb.Protocol_TCP || pbPort.Protocol == pb.Protocol_UDP {
+		pbPort.Mode = v1.Mode_INGRESS
+		if pbPort.Protocol == v1.Protocol_TCP || pbPort.Protocol == v1.Protocol_UDP {
 			logrus.Warn("TCP ingress is not supported; assuming HTTP")
-			pbPort.Protocol = pb.Protocol_HTTP
+			pbPort.Protocol = v1.Protocol_HTTP
 		}
 	default:
 		return nil, fmt.Errorf("port mode not one of [host ingress]: %v", port.Mode)
 	}
 	return pbPort, nil
 }
 
-func convertPorts(ports []types.ServicePortConfig) ([]*pb.Port, error) {
-	var pbports []*pb.Port
+func convertPorts(ports []types.ServicePortConfig) ([]*v1.Port, error) {
+	var pbports []*v1.Port
 	for _, port := range ports {
 		pbPort, err := convertPort(port)
 		if err != nil {
@@ -227,7 +227,7 @@ func convertPorts(ports []types.ServicePortConfig) ([]*pb.Port, error) {
 
 func uploadTarball(ctx context.Context, client defangv1connect.FabricControllerClient, body *bytes.Buffer, digest string) (string, error) {
 	// Upload the tarball to the fabric controller storage; TODO: use a streaming API
-	ureq := &pb.UploadURLRequest{Digest: digest}
+	ureq := &v1.UploadURLRequest{Digest: digest}
 	res, err := client.CreateUploadURL(ctx, connect.NewRequest(ureq))
 	if err != nil {
 		return "", err

src/pkg/cli/composeRestart.go

@@ -3,11 +3,11 @@ package cli
 import (
 	"context"
 
-	pb "github.com/defang-io/defang/src/protos/io/defang/v1"
+	v1 "github.com/defang-io/defang/src/protos/io/defang/v1"
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 )
 
-func ComposeRestart(ctx context.Context, client defangv1connect.FabricControllerClient, filePath, projectName string) ([]*pb.ServiceInfo, error) {
+func ComposeRestart(ctx context.Context, client defangv1connect.FabricControllerClient, filePath, projectName string) ([]*v1.ServiceInfo, error) {
 	project, err := loadDockerCompose(filePath, projectName)
 	if err != nil {
 		return nil, err

src/pkg/cli/composeStart.go

@@ -11,13 +11,13 @@ import (
 	"github.com/bufbuild/connect-go"
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/defang-io/defang/src/pkg"
-	pb "github.com/defang-io/defang/src/protos/io/defang/v1"
+	v1 "github.com/defang-io/defang/src/protos/io/defang/v1"
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 	"github.com/sirupsen/logrus"
 )
 
 // ComposeStart reads a docker-compose.yml file and uploads the services to the fabric controller
-func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerClient, filePath, projectName string, force bool) ([]*pb.ServiceInfo, error) {
+func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerClient, filePath, projectName string, force bool) ([]*v1.ServiceInfo, error) {
 	project, err := loadDockerCompose(filePath, projectName)
 	if err != nil {
 		return nil, &ComposeError{err}
@@ -221,11 +221,11 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 	//
 	// Publish updates
 	//
-	var services []*pb.Service
+	var services []*v1.Service
 	for _, svccfg := range project.Services {
-		var healthcheck *pb.HealthCheck
+		var healthcheck *v1.HealthCheck
 		if svccfg.HealthCheck != nil && len(svccfg.HealthCheck.Test) > 0 && !svccfg.HealthCheck.Disable {
-			healthcheck = &pb.HealthCheck{
+			healthcheck = &v1.HealthCheck{
 				Test: svccfg.HealthCheck.Test,
 			}
 			if nil != svccfg.HealthCheck.Interval {
@@ -246,15 +246,15 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 		}
 		// Show a warning when we have ingress ports but no explicit healthcheck
 		for _, port := range ports {
-			if port.Mode == pb.Mode_INGRESS && healthcheck == nil {
+			if port.Mode == v1.Mode_INGRESS && healthcheck == nil {
 				logrus.Warn("ingress port without healthcheck defaults to GET / HTTP/1.1")
 				break
 			}
 		}
 
-		var deploy *pb.Deploy
+		var deploy *v1.Deploy
 		if svccfg.Deploy != nil {
-			deploy = &pb.Deploy{}
+			deploy = &v1.Deploy{}
 			deploy.Replicas = 1 // default to one replica per service; allow the user to override this to 0
 			if svccfg.Deploy.Replicas != nil {
 				deploy.Replicas = uint32(*svccfg.Deploy.Replicas)
@@ -269,16 +269,16 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 						panic(err) // was already validated above
 					}
 				}
-				var devices []*pb.Device
+				var devices []*v1.Device
 				for _, d := range reservations.Devices {
-					devices = append(devices, &pb.Device{
+					devices = append(devices, &v1.Device{
 						Capabilities: d.Capabilities,
 						Count:        uint32(d.Count),
 						Driver:       d.Driver,
 					})
 				}
-				deploy.Resources = &pb.Resources{
-					Reservations: &pb.Resource{
+				deploy.Resources = &v1.Resources{
+					Reservations: &v1.Resource{
 						Cpus:    float32(cpus),
 						Memory:  float32(reservations.MemoryBytes) / MiB,
 						Devices: devices,
@@ -292,15 +292,15 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 		}
 
 		// Upload the build context, if any; TODO: parallelize
-		var build *pb.Build
+		var build *v1.Build
 		if svccfg.Build != nil {
 			// Pack the build context into a tarball and upload
 			url, err := getRemoteBuildContext(ctx, client, svccfg.Name, svccfg.Build, force)
 			if err != nil {
 				return nil, err
 			}
 
-			build = &pb.Build{
+			build = &v1.Build{
 				Context:    url,
 				Dockerfile: svccfg.Build.Dockerfile,
 				ShmSize:    float32(svccfg.Build.ShmSize) / MiB,
@@ -331,9 +331,9 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 		}
 
 		// Extract secret references
-		var secrets []*pb.Secret
+		var secrets []*v1.Secret
 		for _, secret := range svccfg.Secrets {
-			secrets = append(secrets, &pb.Secret{
+			secrets = append(secrets, &v1.Secret{
 				Source: secret.Source,
 			})
 		}
@@ -343,7 +343,7 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 			init = *svccfg.Init
 		}
 
-		services = append(services, &pb.Service{
+		services = append(services, &v1.Service{
 			Name:        NormalizeServiceName(svccfg.Name),
 			Image:       svccfg.Image,
 			Build:       build,
@@ -364,7 +364,7 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 		return nil, &ComposeError{fmt.Errorf("no services found")}
 	}
 
-	var serviceInfos []*pb.ServiceInfo
+	var serviceInfos []*v1.ServiceInfo
 	for _, service := range services {
 		if DoDryRun {
 			PrintObject(service.Name, service)

src/pkg/cli/compose_test.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/bufbuild/connect-go"
 	"github.com/compose-spec/compose-go/v2/types"
-	pb "github.com/defang-io/defang/src/protos/io/defang/v1"
+	v1 "github.com/defang-io/defang/src/protos/io/defang/v1"
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 )
 
@@ -79,7 +79,7 @@ func TestConvertPort(t *testing.T) {
 	tests := []struct {
 		name     string
 		input    types.ServicePortConfig
-		expected *pb.Port
+		expected *v1.Port
 		wantErr  string
 	}{
 		{
@@ -90,7 +90,7 @@ func TestConvertPort(t *testing.T) {
 		{
 			name:     "Undefined mode and protocol, target only",
 			input:    types.ServicePortConfig{Target: 1234},
-			expected: &pb.Port{Target: 1234, Mode: pb.Mode_HOST},
+			expected: &v1.Port{Target: 1234, Mode: v1.Mode_HOST},
 		},
 		{
 			name:    "Published range xfail",
@@ -100,12 +100,12 @@ func TestConvertPort(t *testing.T) {
 		{
 			name:     "Implied ingress mode, defined protocol, published equals target",
 			input:    types.ServicePortConfig{Mode: "ingress", Protocol: "tcp", Published: "1234", Target: 1234},
-			expected: &pb.Port{Target: 1234, Mode: pb.Mode_HOST, Protocol: pb.Protocol_TCP},
+			expected: &v1.Port{Target: 1234, Mode: v1.Mode_HOST, Protocol: v1.Protocol_TCP},
 		},
 		{
 			name:     "Implied ingress mode, udp protocol, published equals target",
 			input:    types.ServicePortConfig{Mode: "ingress", Protocol: "udp", Published: "1234", Target: 1234},
-			expected: &pb.Port{Target: 1234, Mode: pb.Mode_HOST, Protocol: pb.Protocol_UDP},
+			expected: &v1.Port{Target: 1234, Mode: v1.Mode_HOST, Protocol: v1.Protocol_UDP},
 		},
 		{
 			name:    "Localhost IP, unsupported mode and protocol xfail",
@@ -115,7 +115,7 @@ func TestConvertPort(t *testing.T) {
 		{
 			name:     "Ingress mode without host IP, single target",
 			input:    types.ServicePortConfig{Mode: "ingress", Protocol: "tcp", Target: 1234},
-			expected: &pb.Port{Target: 1234, Mode: pb.Mode_INGRESS, Protocol: pb.Protocol_HTTP},
+			expected: &v1.Port{Target: 1234, Mode: v1.Mode_INGRESS, Protocol: v1.Protocol_HTTP},
 		},
 		{
 			name:    "Ingress mode without host IP, single target, published range xfail",
@@ -240,14 +240,14 @@ type mockGrpcClient struct {
 	url string
 }
 
-func (m mockGrpcClient) CreateUploadURL(ctx context.Context, req *connect.Request[pb.UploadURLRequest]) (*connect.Response[pb.UploadURLResponse], error) {
-	return connect.NewResponse(&pb.UploadURLResponse{Url: m.url + req.Msg.Digest}), nil
+func (m mockGrpcClient) CreateUploadURL(ctx context.Context, req *connect.Request[v1.UploadURLRequest]) (*connect.Response[v1.UploadURLResponse], error) {
+	return connect.NewResponse(&v1.UploadURLResponse{Url: m.url + req.Msg.Digest}), nil
 }
 
-func (mockGrpcClient) Subscribe(context.Context, *connect.Request[pb.SubscribeRequest]) (*connect.ServerStreamForClient[pb.SubscribeResponse], error) {
+func (mockGrpcClient) Subscribe(context.Context, *connect.Request[v1.SubscribeRequest]) (*connect.ServerStreamForClient[v1.SubscribeResponse], error) {
 	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("io.defang.v1.FabricController.Subscribe is not implemented"))
 }
 
-func (mockGrpcClient) Tail(context.Context, *connect.Request[pb.TailRequest]) (*connect.ServerStreamForClient[pb.TailResponse], error) {
+func (mockGrpcClient) Tail(context.Context, *connect.Request[v1.TailRequest]) (*connect.ServerStreamForClient[v1.TailResponse], error) {
 	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("io.defang.v1.FabricController.Tail is not implemented"))
 }

src/pkg/cli/connect.go

@@ -5,12 +5,12 @@ import (
 	"strings"
 
 	"github.com/bufbuild/connect-go"
-	"github.com/defang-io/defang/src/pkg"
 	"github.com/defang-io/defang/src/pkg/auth"
+	"github.com/defang-io/defang/src/pkg/types"
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 )
 
-func Connect(server string) (defangv1connect.FabricControllerClient, pkg.TenantID) {
+func Connect(server string) (defangv1connect.FabricControllerClient, types.TenantID) {
 	accessToken := GetExistingToken(server)
 	tenantId, _ := TenantFromAccessToken(accessToken)
 	_, host := SplitTenantHost(server) // TODO: use this returned tenantId when we have no access token

src/pkg/cli/delete.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/bufbuild/connect-go"
-	pb "github.com/defang-io/defang/src/protos/io/defang/v1"
+	v1 "github.com/defang-io/defang/src/protos/io/defang/v1"
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 )
 
@@ -15,7 +15,7 @@ func Delete(ctx context.Context, client defangv1connect.FabricControllerClient,
 		return "", nil
 	}
 
-	resp, err := client.Delete(ctx, connect.NewRequest(&pb.DeleteRequest{Names: names}))
+	resp, err := client.Delete(ctx, connect.NewRequest(&v1.DeleteRequest{Names: names}))
 	if err != nil {
 		return "", err
 	}