pipe through all of the protobuf stuff

coder · aslilac · Feb 21, 2024 · Feb 9, 2024 · Feb 9, 2024 · Feb 9, 2024
commit 179adae6a5c65d7ebdae073c43cd478265ec7469
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1133,7 +1133,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 		for _, externalAuthProvider := range jobType.TemplateImport.ExternalAuthProviders {
 			contains := false
 			for _, configuredProvider := range s.ExternalAuthConfigs {
-				if configuredProvider.ID == externalAuthProvider {
+				if configuredProvider.ID == externalAuthProvider.Id {
 					contains = true
 					break
 				}
@@ -1147,9 +1147,17 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 			}
 		}
 
+		externalAuthProviderIds := jobType.TemplateImport.ExternalAuthProvidersNames
+		if providersLen := len(jobType.TemplateImport.ExternalAuthProviders); providersLen > 0 {
+			externalAuthProviderIds = make([]string, 0, providersLen)
+			for _, provider := range jobType.TemplateImport.ExternalAuthProviders {
+				externalAuthProviderIds = append(externalAuthProviderIds, provider.Id)
+			}
+		}
+
 		err = s.Database.UpdateTemplateVersionExternalAuthProvidersByJobID(ctx, database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams{
 			JobID:                 jobID,
-			ExternalAuthProviders: jobType.TemplateImport.ExternalAuthProviders,
+			ExternalAuthProviders: externalAuthProviderIds,
 			UpdatedAt:             dbtime.Now(),
 		})
 		if err != nil {

diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -41,6 +41,7 @@ type TemplateVersionExternalAuth struct {
 	DisplayIcon     string `json:"display_icon"`
 	AuthenticateURL string `json:"authenticate_url"`
 	Authenticated   bool   `json:"authenticated"`
+	Optional        bool   `json:"optional"`
 }
 
 type ValidationMonotonicOrder string

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/docs/api/templates.md b/docs/api/templates.md
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -239,6 +239,16 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
 		apiVersion = qv
 	}
 
+	if err := proto.CurrentVersion.Validate(apiVersion); err != nil {
+		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+			Message: "Incompatible or unparseable version",
+			Validations: []codersdk.ValidationError{
+				{Field: "version", Detail: err.Error()},
+			},
+		})
+		return
+	}
+
 	// Create the daemon in the database.
 	now := dbtime.Now()
 	daemon, err := api.Database.UpsertProvisionerDaemon(authCtx, database.UpsertProvisionerDaemonParams{

diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -123,7 +123,7 @@ type resourceMetadataItem struct {
 type State struct {
 	Resources             []*proto.Resource
 	Parameters            []*proto.RichParameter
-	ExternalAuthProviders []string
+	ExternalAuthProviders []*proto.ExternalAuthProviderResource
 }
 
 // ConvertState consumes Terraform state and a GraphViz representation
@@ -695,7 +695,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 	}
 
 	// A map is used to ensure we don't have duplicates!
-	externalAuthProvidersMap := map[string]struct{}{}
+	externalAuthProvidersMap := map[string]*proto.ExternalAuthProviderResource{}
 	for _, tfResources := range tfResourcesByLabel {
 		for _, resource := range tfResources {
 			// Checking for `coder_git_auth` is legacy!
@@ -706,12 +706,18 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 			if !ok {
 				return nil, xerrors.Errorf("external auth id is not a string")
 			}
-			externalAuthProvidersMap[id] = struct{}{}
+
+			optional := false
+			optionalAttribute, ok := resource.AttributeValues["optional"].(bool)
+			if ok {
+				optional = optionalAttribute
+			}
+			externalAuthProvidersMap[id] = &proto.ExternalAuthProviderResource{Optional: optional}
 		}
 	}
-	externalAuthProviders := make([]string, 0, len(externalAuthProvidersMap))
-	for id := range externalAuthProvidersMap {
-		externalAuthProviders = append(externalAuthProviders, id)
+	externalAuthProviders := make([]*proto.ExternalAuthProviderResource, 0, len(externalAuthProvidersMap))
+	for _, provider := range externalAuthProvidersMap {
+		externalAuthProviders = append(externalAuthProviders, provider)
 	}
 
 	return &State{