move apptypes into Connect client

posit-dev · Dec 4, 2023 · 77399fb · 77399fb
1 parent 89065b0
commit 77399fb
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 30 deletions.
diff --git a/internal/bundles/bundle_test.go b/internal/bundles/bundle_test.go
@@ -15,8 +15,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rstudio/connect-client/internal/apptypes"
 	"github.com/rstudio/connect-client/internal/bundles/bundlestest"
+	"github.com/rstudio/connect-client/internal/clients/connect"
 	"github.com/rstudio/connect-client/internal/events"
 	"github.com/rstudio/connect-client/internal/logging"
 	"github.com/rstudio/connect-client/internal/logging/loggingtest"
@@ -160,7 +160,7 @@ func (s *BundlerSuite) SetupTest() {
 	s.cwd.MkdirAll(0700)
 
 	s.manifest = NewManifest()
-	s.manifest.Metadata.AppMode = apptypes.StaticMode
+	s.manifest.Metadata.AppMode = connect.StaticMode
 	s.manifest.Metadata.Entrypoint = "subdir/testfile"
 }
 

diff --git a/internal/bundles/manifest.go b/internal/bundles/manifest.go
@@ -10,7 +10,7 @@ import (
 	"io"
 	"sort"
 
-	"github.com/rstudio/connect-client/internal/apptypes"
+	"github.com/rstudio/connect-client/internal/clients/connect"
 	"github.com/rstudio/connect-client/internal/config"
 	"github.com/rstudio/connect-client/internal/util"
 )
@@ -43,12 +43,12 @@ type Manifest struct {
 
 // Metadata contains details about this deployment (type, etc).
 type Metadata struct {
-	AppMode         apptypes.AppMode `json:"appmode" help:"Type of content being deployed. Default is to auto detect."` // Selects the runtime for this content.
-	ContentCategory string           `json:"content_category,omitempty"`                                                // A refinement of the AppMode used by plots and sites
-	Entrypoint      string           `json:"entrypoint,omitempty"`                                                      // The main file being deployed.
-	PrimaryRmd      string           `json:"primary_rmd,omitempty"`                                                     // The rendering target for Rmd deployments.
-	PrimaryHtml     string           `json:"primary_html,omitempty"`                                                    // The default document for static deployments.
-	HasParameters   bool             `json:"has_parameters,omitempty"`                                                  // True if this is content allows parameter customization.
+	AppMode         connect.AppMode `json:"appmode" help:"Type of content being deployed. Default is to auto detect."` // Selects the runtime for this content.
+	ContentCategory string          `json:"content_category,omitempty"`                                                // A refinement of the AppMode used by plots and sites
+	Entrypoint      string          `json:"entrypoint,omitempty"`                                                      // The main file being deployed.
+	PrimaryRmd      string          `json:"primary_rmd,omitempty"`                                                     // The rendering target for Rmd deployments.
+	PrimaryHtml     string          `json:"primary_html,omitempty"`                                                    // The default document for static deployments.
+	HasParameters   bool            `json:"has_parameters,omitempty"`                                                  // True if this is content allows parameter customization.
 }
 
 type Environment struct {
@@ -154,28 +154,28 @@ func NewManifest() *Manifest {
 	}
 }
 
-var connectContentTypeMap = map[config.ContentType]apptypes.AppMode{
-	config.ContentTypeHTML:            apptypes.StaticMode,
-	config.ContentTypeJupyterNotebook: apptypes.StaticJupyterMode,
-	config.ContentTypeJupyterVoila:    apptypes.JupyterVoilaMode,
-	config.ContentTypePythonBokeh:     apptypes.PythonBokehMode,
-	config.ContentTypePythonDash:      apptypes.PythonDashMode,
-	config.ContentTypePythonFastAPI:   apptypes.PythonFastAPIMode,
-	config.ContentTypePythonFlask:     apptypes.PythonAPIMode,
-	config.ContentTypePythonShiny:     apptypes.PythonShinyMode,
-	config.ContentTypePythonStreamlit: apptypes.PythonStreamlitMode,
-	config.ContentTypeQuartoShiny:     apptypes.ShinyQuartoMode,
-	config.ContentTypeQuarto:          apptypes.StaticQuartoMode,
-	config.ContentTypeRPlumber:        apptypes.PlumberAPIMode,
-	config.ContentTypeRShiny:          apptypes.ShinyMode,
-	config.ContentTypeRMarkdownShiny:  apptypes.ShinyRmdMode,
-	config.ContentTypeRMarkdown:       apptypes.StaticRmdMode,
+var connectContentTypeMap = map[config.ContentType]connect.AppMode{
+	config.ContentTypeHTML:            connect.StaticMode,
+	config.ContentTypeJupyterNotebook: connect.StaticJupyterMode,
+	config.ContentTypeJupyterVoila:    connect.JupyterVoilaMode,
+	config.ContentTypePythonBokeh:     connect.PythonBokehMode,
+	config.ContentTypePythonDash:      connect.PythonDashMode,
+	config.ContentTypePythonFastAPI:   connect.PythonFastAPIMode,
+	config.ContentTypePythonFlask:     connect.PythonAPIMode,
+	config.ContentTypePythonShiny:     connect.PythonShinyMode,
+	config.ContentTypePythonStreamlit: connect.PythonStreamlitMode,
+	config.ContentTypeQuartoShiny:     connect.ShinyQuartoMode,
+	config.ContentTypeQuarto:          connect.StaticQuartoMode,
+	config.ContentTypeRPlumber:        connect.PlumberAPIMode,
+	config.ContentTypeRShiny:          connect.ShinyMode,
+	config.ContentTypeRMarkdownShiny:  connect.ShinyRmdMode,
+	config.ContentTypeRMarkdown:       connect.StaticRmdMode,
 }
 
 func NewManifestFromConfig(cfg *config.Config) *Manifest {
 	contentType, ok := connectContentTypeMap[cfg.Type]
 	if !ok {
-		contentType = apptypes.UnknownMode
+		contentType = connect.UnknownMode
 	}
 	m := &Manifest{
 		Version: 1,

diff --git a/internal/apptypes/apptypes.go → internal/clients/connect/apptypes.go b/internal/apptypes/apptypes.go → internal/clients/connect/apptypes.go
@@ -1,4 +1,4 @@
-package apptypes
+package connect
 
 // Copyright (C) 2022 by Posit Software, PBC.
 

diff --git a/internal/apptypes/apptypes_test.go → internal/clients/connect/apptypes_test.go b/internal/apptypes/apptypes_test.go → internal/clients/connect/apptypes_test.go
@@ -1,4 +1,4 @@
-package apptypes
+package connect
 
 // Copyright (C) 2023 by Posit Software, PBC.
 

diff --git a/internal/clients/connect/client_connect.go b/internal/clients/connect/client_connect.go
@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/rstudio/connect-client/internal/accounts"
-	"github.com/rstudio/connect-client/internal/apptypes"
 	"github.com/rstudio/connect-client/internal/clients/http_client"
 	"github.com/rstudio/connect-client/internal/config"
 	"github.com/rstudio/connect-client/internal/events"
@@ -127,7 +126,7 @@ type connectGetContentDTO struct {
 	Created            types.Time         `json:"created_time"`
 	LastDeployed       types.Time         `json:"last_deployed_time"`
 	BundleId           types.NullInt64Str `json:"bundle_id"`
-	AppMode            apptypes.AppMode   `json:"app_mode"`
+	AppMode            AppMode            `json:"app_mode"`
 	ContentCategory    string             `json:"content_category"`
 	Parameterized      bool               `json:"parameterized"`
 	ClusterName        types.NullString   `json:"cluster_name"`