Rename post files to upload

coder · kylecarbs · Feb 24, 2022 · Feb 25, 2022 · Feb 25, 2022 · Feb 26, 2022
commit 773e38f02582be1fbf46a839fcb82dcae6b591fb
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -116,9 +116,9 @@ func New(options *Options) (http.Handler, func()) {
 			})
 		})
 
-		r.Route("/files", func(r chi.Router) {
+		r.Route("/upload", func(r chi.Router) {
 			r.Use(httpmw.ExtractAPIKey(options.Database, nil))
-			r.Post("/", api.postFiles)
+			r.Post("/", api.postUpload)
 		})
 
 		r.Route("/projectimport/{organization}", func(r chi.Router) {

diff --git a/coderd/downloads.go b/coderd/downloads.go
diff --git a/coderd/files.go b/coderd/files.go
@@ -18,7 +18,7 @@ type UploadFileResponse struct {
 	Hash string `json:"hash"`
 }
 
-func (api *api) postFiles(rw http.ResponseWriter, r *http.Request) {
+func (api *api) postUpload(rw http.ResponseWriter, r *http.Request) {
 	apiKey := httpmw.APIKey(r)
 	contentType := r.Header.Get("Content-Type")
 

diff --git a/coderd/files_test.go b/coderd/files_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
-func TestPostFiles(t *testing.T) {
+func TestPostUpload(t *testing.T) {
 	t.Parallel()
 	t.Run("BadContentType", func(t *testing.T) {
 		t.Parallel()

diff --git a/codersdk/files.go b/codersdk/files.go
@@ -15,7 +15,7 @@ const (
 )
 
 func (c *Client) UploadFile(ctx context.Context, contentType string, content []byte) (coderd.UploadFileResponse, error) {
-	res, err := c.request(ctx, http.MethodPost, "/api/v2/files", content, func(r *http.Request) {
+	res, err := c.request(ctx, http.MethodPost, "/api/v2/upload", content, func(r *http.Request) {
 		r.Header.Set("Content-Type", contentType)
 	})
 	if err != nil {

diff --git a/provisioner/terraform/provider/provider.go b/provisioner/terraform/provider/provider.go
@@ -3,39 +3,74 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/url"
+	"os"
+	"strings"
 
+	"github.com/coder/coder/provisionersdk"
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
-// New returns a new schema provider for Terraform.
+type config struct {
+	URL *url.URL
+}
+
+// New returns a new Terraform provider.
 func New() *schema.Provider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
-			"workspace_history_id": {
+			"url": {
 				Type:     schema.TypeString,
 				Optional: true,
+				// The "CODER_URL" environment variable is used by default
+				// as the Access URL when generating scripts.
+				DefaultFunc: func() (interface{}, error) {
+					return os.Getenv("CODER_URL"), nil
+				},
+				ValidateFunc: func(i interface{}, s string) ([]string, []error) {
+					_, err := url.Parse(s)
+					if err != nil {
+						return nil, []error{err}
+					}
+					return nil, nil
+				},
 			},
 		},
+		ConfigureContextFunc: func(c context.Context, rd *schema.ResourceData) (interface{}, diag.Diagnostics) {
+			rawURL := rd.Get("url").(string)
+			if rawURL == "" {
+				return nil, diag.Errorf("CODER_URL must not be empty; got %q", rawURL)
+			}
+			parsed, err := url.Parse(rd.Get("url").(string))
+			if err != nil {
+				return nil, diag.FromErr(err)
+			}
+			return config{
+				URL: parsed,
+			}, nil
+		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"coder_agent_script": {
 				Description: "TODO",
 				ReadContext: func(c context.Context, rd *schema.ResourceData, i interface{}) diag.Diagnostics {
+					config := i.(config)
 					osRaw := rd.Get("os")
 					os := osRaw.(string)
-
 					archRaw := rd.Get("arch")
 					arch := archRaw.(string)
 
-					fmt.Printf("Got OS: %s_%s\n", os, arch)
-
-					err := rd.Set("value", "SOME SCRIPT")
+					script, err := provisionersdk.AgentScript(os, arch, config.URL)
+					if err != nil {
+						return diag.FromErr(err)
+					}
+					err = rd.Set("value", script)
 					if err != nil {
 						return diag.FromErr(err)
 					}
-					rd.SetId("something")
+					rd.SetId(strings.Join([]string{os, arch}, "_"))
 					return nil
 				},
 				Schema: map[string]*schema.Schema{

diff --git a/provisioner/terraform/provider/provider_test.go b/provisioner/terraform/provider/provider_test.go
@@ -1,7 +1,6 @@
 package provider_test
 
 import (
-	"encoding/json"
 	"fmt"
 	"testing"
 
@@ -27,8 +26,12 @@ func TestSomething(t *testing.T) {
 		},
 		IsUnitTest: true,
 		Steps: []resource.TestStep{{
-			Config: `data "coder_agent_script" "new" {
-				arch = "x64"
+			Config: `
+			provider "coder" {
+				url = "https://example.com"
+			}
+			data "coder_agent_script" "new" {
+				arch = "amd64"
 				os = "linux"
 			}`,
 			Check: func(s *terraform.State) error {
@@ -46,7 +49,12 @@ func TestAnother(t *testing.T) {
 		},
 		IsUnitTest: true,
 		Steps: []resource.TestStep{{
-			Config: `resource "coder_agent" "new" {
+			Config: `
+			provider "coder" {
+				url = "https://example.com"
+			}
+
+			resource "coder_agent" "new" {
 				auth {
 					type = "gcp"
 				}
@@ -59,8 +67,8 @@ func TestAnother(t *testing.T) {
 				// for _, mod := range s.Modules {
 				// 	fmt.Printf("check state: %+v\n", mod.Resources)
 				// }
-				data, _ := json.MarshalIndent(s, "", "\t")
-				fmt.Printf("Data: %s\n", data)
+				// data, _ := json.MarshalIndent(s, "", "\t")
+				// fmt.Printf("Data: %s\n", data)
 
 				return nil
 			},

diff --git a/provisionersdk/agent.go b/provisionersdk/agent.go
@@ -43,35 +43,29 @@ exec $BINARY_LOCATION agent
 	}
 )
 
-// AgentBinaryName returns the binary name for an operating system and agent.
-func AgentBinaryName(operatingSystem, architecture string) (string, error) {
-
-}
+// CODER_URL, operating system, and architecture can return the URL of the Coder binary.
 
 // AgentScript returns an installation script for the specified operating system
 // and architecture.
 //
 // baseURL is
-func AgentScript(operatingSystem, architecture string, baseURL *url.URL) (string, error) {
-	architectures, ok := agentScript[operatingSystem]
-	if !ok {
+func AgentScript(operatingSystem, architecture string, binaryDownloadURL *url.URL) (string, error) {
+	architectures, exists := agentScript[operatingSystem]
+	if !exists {
 		list := []string{}
 		for key := range agentScript {
 			list = append(list, key)
 		}
 		return "", xerrors.Errorf("operating system %q not supported. must be in: %v", operatingSystem, list)
 	}
-	script, ok := architectures[architecture]
-	if !ok {
+	script, exists := architectures[architecture]
+	if !exists {
 		list := []string{}
 		for key := range architectures {
 			list = append(list, key)
 		}
 		return "", xerrors.Errorf("architecture %q not supported for %q. must be in: %v", architecture, operatingSystem, list)
 	}
-	if !strings.HasPrefix(baseURL.Path, "/api/v2/downloads") {
-
-	}
 
-	return strings.ReplaceAll(script, "${DOWNLOAD_URL}", baseURL.String()), nil
+	return strings.ReplaceAll(script, "${DOWNLOAD_URL}", binaryDownloadURL.String()), nil
 }