remove preview env refs for now

api/client/preview_environment.go

@@ -1,27 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/porter-dev/porter/api/types"
-)
-
-func (c *Client) CreatePreviewEnvironment(
-	ctx context.Context,
-	projectID, clusterID uint,
-	req *types.CreatePreviewEnvironmentRequest,
-) (*types.PreviewEnvironment, error) {
-	resp := &types.PreviewEnvironment{}
-
-	err := c.postRequest(
-		fmt.Sprintf(
-			"/projects/%d/clusters/%d/preview_environments",
-			projectID, clusterID,
-		),
-		req,
-		resp,
-	)
-
-	return resp, err
-}

api/server/handlers/preview_environment/create.go

@@ -1,69 +0,0 @@
-package preview_environment
-
-import (
-	"net/http"
-
-	"github.com/porter-dev/porter/api/server/handlers"
-	"github.com/porter-dev/porter/api/server/shared"
-	"github.com/porter-dev/porter/api/server/shared/apierrors"
-	"github.com/porter-dev/porter/api/server/shared/config"
-	"github.com/porter-dev/porter/api/types"
-	"github.com/porter-dev/porter/internal/models"
-	"github.com/porter-dev/porter/internal/telemetry"
-)
-
-type CreatePreviewEnvironmentHandler struct {
-	handlers.PorterHandlerReadWriter
-}
-
-func NewCreatePreviewEnvironmentHandler(
-	config *config.Config,
-	decoderValidator shared.RequestDecoderValidator,
-	writer shared.ResultWriter,
-) *CreatePreviewEnvironmentHandler {
-	return &CreatePreviewEnvironmentHandler{
-		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
-	}
-}
-
-func (c *CreatePreviewEnvironmentHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	ctx, span := telemetry.NewSpan(r.Context(), "serve-create-preview-env")
-	defer span.End()
-
-	project, _ := ctx.Value(types.ProjectScope).(*models.Project)
-	cluster, _ := ctx.Value(types.ClusterScope).(*models.Cluster)
-
-	request := &types.CreatePreviewEnvironmentRequest{}
-	if ok := c.DecodeAndValidate(w, r, request); !ok {
-		err := telemetry.Error(ctx, span, nil, "error decoding request")
-		c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusBadRequest))
-		return
-	}
-
-	telemetry.WithAttributes(span,
-		telemetry.AttributeKV{Key: "cluster-id", Value: cluster.ID},
-		telemetry.AttributeKV{Key: "project-id", Value: project.ID},
-		telemetry.AttributeKV{Key: "env-config-id", Value: request.EnvironmentConfigID},
-		telemetry.AttributeKV{Key: "git-repo-owner", Value: request.GitRepoOwner},
-		telemetry.AttributeKV{Key: "git-repo-name", Value: request.GitRepoName},
-		telemetry.AttributeKV{Key: "branch", Value: request.Branch},
-	)
-
-	// create the preview environment
-	previewEnv := &models.PreviewEnvironment{
-		GitRepoOwner:        request.GitRepoOwner,
-		GitRepoName:         request.GitRepoName,
-		Branch:              request.Branch,
-		EnvironmentConfigID: request.EnvironmentConfigID,
-	}
-
-	previewEnv, err := c.Repo().PreviewEnvironment().CreatePreviewEnvironment(previewEnv)
-	if err != nil {
-		err := telemetry.Error(ctx, span, err, "error creating preview environment")
-		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
-		return
-	}
-
-	c.WriteResult(w, r, previewEnv.ToPreviewEnvironmentType())
-	return
-}

api/server/router/preview_environment.go

@@ -1,86 +0,0 @@
-package router
-
-import (
-	"github.com/go-chi/chi/v5"
-	"github.com/porter-dev/porter/api/server/handlers/preview_environment"
-	"github.com/porter-dev/porter/api/server/shared"
-	"github.com/porter-dev/porter/api/server/shared/config"
-	"github.com/porter-dev/porter/api/server/shared/router"
-	"github.com/porter-dev/porter/api/types"
-)
-
-func NewPreviewEnvironmentScopedRegisterer(children ...*router.Registerer) *router.Registerer {
-	return &router.Registerer{
-		GetRoutes: GetPreviewEnvironmentScopedRoutes,
-		Children:  children,
-	}
-}
-
-func GetPreviewEnvironmentScopedRoutes(
-	r chi.Router,
-	config *config.Config,
-	basePath *types.Path,
-	factory shared.APIEndpointFactory,
-	children ...*router.Registerer,
-) []*router.Route {
-	routes, projPath := getPreviewEnvRoutes(r, config, basePath, factory)
-
-	if len(children) > 0 {
-		r.Route(projPath.RelativePath, func(r chi.Router) {
-			for _, child := range children {
-				childRoutes := child.GetRoutes(r, config, basePath, factory, child.Children...)
-
-				routes = append(routes, childRoutes...)
-			}
-		})
-	}
-
-	return routes
-}
-
-func getPreviewEnvRoutes(
-	r chi.Router,
-	config *config.Config,
-	basePath *types.Path,
-	factory shared.APIEndpointFactory,
-) ([]*router.Route, *types.Path) {
-	relPath := "/preview_environments"
-
-	newPath := &types.Path{
-		Parent:       basePath,
-		RelativePath: relPath,
-	}
-
-	var routes []*router.Route
-
-	// POST /api/projects/{project_id}/clusters/{cluster_id}/preview_environments -> preview_environment.NewCreatePreviewEnvironmentHandler
-	createPreviewEnvEndpoint := factory.NewAPIEndpoint(
-		&types.APIRequestMetadata{
-			Verb:   types.APIVerbCreate,
-			Method: types.HTTPVerbPost,
-			Path: &types.Path{
-				Parent:       basePath,
-				RelativePath: relPath,
-			},
-			Scopes: []types.PermissionScope{
-				types.UserScope,
-				types.ProjectScope,
-				types.ClusterScope,
-			},
-		},
-	)
-
-	createPreviewEnvHandler := preview_environment.NewCreatePreviewEnvironmentHandler(
-		config,
-		factory.GetDecoderValidator(),
-		factory.GetResultWriter(),
-	)
-
-	routes = append(routes, &router.Route{
-		Endpoint: createPreviewEnvEndpoint,
-		Handler:  createPreviewEnvHandler,
-		Router:   r,
-	})
-
-	return routes, newPath
-}

api/server/router/router.go

@@ -33,8 +33,7 @@ func NewAPIRouter(config *config.Config) *chi.Mux {
 	clusterIntegrationRegisterer := NewClusterIntegrationScopedRegisterer()
 	stackRegisterer := NewStackScopedRegisterer()
 	envConfigRegisterer := NewEnvConfigScopedRegisterer()
-	previewEnvRegisterer := NewPreviewEnvironmentScopedRegisterer()
-	clusterRegisterer := NewClusterScopedRegisterer(namespaceRegisterer, clusterIntegrationRegisterer, stackRegisterer, envConfigRegisterer, previewEnvRegisterer)
+	clusterRegisterer := NewClusterScopedRegisterer(namespaceRegisterer, clusterIntegrationRegisterer, stackRegisterer, envConfigRegisterer)
 	infraRegisterer := NewInfraScopedRegisterer()
 	gitInstallationRegisterer := NewGitInstallationScopedRegisterer()
 	registryRegisterer := NewRegistryScopedRegisterer()

api/types/environment_config.go

@@ -0,0 +1,11 @@
+package types
+
+type EnvironmentConfig struct {
+	ID                uint `json:"id"`
+	ProjectID         uint `json:"project_id"`
+	ClusterID         uint `json:"cluster_id"`
+	GitInstallationID uint `json:"git_installation_id"`
+
+	Name string `json:"string"`
+	Auto bool   `json:"auto"`
+}

api/types/preview_environment.go

@@ -1,29 +0,0 @@
-package types
-
-type EnvironmentConfig struct {
-	ID                uint `json:"id"`
-	ProjectID         uint `json:"project_id"`
-	ClusterID         uint `json:"cluster_id"`
-	GitInstallationID uint `json:"git_installation_id"`
-
-	Name string `json:"string"`
-	Auto bool   `json:"auto"`
-}
-
-type CreatePreviewEnvironmentRequest struct {
-	EnvironmentConfigID uint   `json:"environment_config_id"`
-	GitRepoOwner        string `json:"git_repo_owner"`
-	GitRepoName         string `json:"git_repo_name"`
-	Branch              string `json:"branch"`
-}
-
-type PreviewEnvironment struct {
-	ID           uint   `json:"id"`
-	GitRepoOwner string `json:"git_repo_owner"`
-	GitRepoName  string `json:"git_repo_name"`
-	Branch       string `json:"branch"`
-
-	NewCommentsDisabled bool `json:"new_comments_disabled"`
-
-	EnvironmentConfigID uint `json:"environment_config_id"`
-}

cli/cmd/stack/hooks.go

@@ -117,27 +117,6 @@ func (t *DeployAppHook) applyApp(shouldCreate bool, driverOutput map[string]inte
 		}
 		return fmt.Errorf("error updating app %s: %w", t.ApplicationName, err)
 	}
-
-	if t.EnvironmentMeta.GitHubMetadata.BranchFrom != "" {
-		color.New(color.FgGreen).Printf("Creating preview environment for app %s based on branch '%s'\n", t.ApplicationName, t.EnvironmentMeta.GitHubMetadata.BranchFrom)
-		// create preview env record
-		_, err = t.Client.CreatePreviewEnvironment(
-			context.Background(),
-			t.ProjectID,
-			t.ClusterID,
-			&types.CreatePreviewEnvironmentRequest{
-				EnvironmentConfigID: t.EnvironmentMeta.EnvironmentConfigID,
-				GitRepoOwner:        t.EnvironmentMeta.GitHubMetadata.RepoOwner,
-				GitRepoName:         t.EnvironmentMeta.GitHubMetadata.Repo,
-				Branch:              t.EnvironmentMeta.GitHubMetadata.BranchFrom,
-			},
-		)
-
-		if err != nil {
-			return fmt.Errorf("error creating preview environment: %w", err)
-		}
-	}
-
 	return nil
 }
 

internal/models/environment_config.go

@@ -21,7 +21,6 @@ type EnvironmentConfig struct {
 	Auto      bool   `gorm:"default:false"`
 	IsDefault bool   `gorm:"default:false"`
 
-	PreviewEnvironments []PreviewEnvironment
 	PorterApps          []PorterApp
 }
 

internal/models/preview_environment.go

@@ -1,30 +0,0 @@
-package models
-
-import (
-	"github.com/porter-dev/porter/api/types"
-	"gorm.io/gorm"
-)
-
-type PreviewEnvironment struct {
-	gorm.Model
-
-	GitRepoOwner string
-	GitRepoName  string
-	Branch       string
-
-	NewCommentsDisabled bool
-
-	EnvironmentConfigID uint
-	EnvironmentConfig   EnvironmentConfig
-}
-
-func (p *PreviewEnvironment) ToPreviewEnvironmentType() *types.PreviewEnvironment {
-	return &types.PreviewEnvironment{
-		ID:                  p.Model.ID,
-		GitRepoOwner:        p.GitRepoOwner,
-		GitRepoName:         p.GitRepoName,
-		Branch:              p.Branch,
-		NewCommentsDisabled: p.NewCommentsDisabled,
-		EnvironmentConfigID: p.EnvironmentConfigID,
-	}
-}

internal/repository/gorm/migrate.go

@@ -63,7 +63,6 @@ func AutoMigrate(db *gorm.DB, debug bool) error {
 		&models.PorterApp{},
 		&models.PorterAppEvent{},
 		&models.EnvironmentConfig{},
-		&models.PreviewEnvironment{},
 		&ints.KubeIntegration{},
 		&ints.BasicIntegration{},
 		&ints.OIDCIntegration{},

internal/repository/gorm/preview_environment.go

@@ -1,25 +0,0 @@
-package gorm
-
-import (
-	"github.com/porter-dev/porter/internal/models"
-	"github.com/porter-dev/porter/internal/repository"
-	"gorm.io/gorm"
-)
-
-// PreviewEnvironmentRepository uses gorm.DB for querying the database
-type PreviewEnvironmentRepository struct {
-	db *gorm.DB
-}
-
-// NewPreviewEnvironmentRepository returns a PreviewEnvironmentRepository which uses
-// gorm.DB for querying the database
-func NewPreviewEnvironmentRepository(db *gorm.DB) repository.PreviewEnvironmentRepository {
-	return &PreviewEnvironmentRepository{db}
-}
-
-func (repo *PreviewEnvironmentRepository) CreatePreviewEnvironment(a *models.PreviewEnvironment) (*models.PreviewEnvironment, error) {
-	if err := repo.db.Create(a).Error; err != nil {
-		return nil, err
-	}
-	return a, nil
-}

internal/repository/gorm/repository.go

@@ -54,7 +54,6 @@ type GormRepository struct {
 	porterApp                 repository.PorterAppRepository
 	porterAppEvent            repository.PorterAppEventRepository
 	environmentConfig         repository.EnvironmentConfigRepository
-	previewEnvironment        repository.PreviewEnvironmentRepository
 }
 
 func (t *GormRepository) User() repository.UserRepository {
@@ -245,10 +244,6 @@ func (t *GormRepository) EnvironmentConfig() repository.EnvironmentConfigReposit
 	return t.environmentConfig
 }
 
-func (t *GormRepository) PreviewEnvironment() repository.PreviewEnvironmentRepository {
-	return t.previewEnvironment
-}
-
 // NewRepository returns a Repository which persists users in memory
 // and accepts a parameter that can trigger read/write errors
 func NewRepository(db *gorm.DB, key *[32]byte, storageBackend credentials.CredentialStorage) repository.Repository {
@@ -300,6 +295,5 @@ func NewRepository(db *gorm.DB, key *[32]byte, storageBackend credentials.Creden
 		porterApp:                 NewPorterAppRepository(db),
 		porterAppEvent:            NewPorterAppEventRepository(db),
 		environmentConfig:         NewEnvironmentConfigRepository(db),
-		previewEnvironment:        NewPreviewEnvironmentRepository(db),
 	}
 }

internal/repository/preview_environment.go

@@ -1,10 +0,0 @@
-package repository
-
-import (
-	"github.com/porter-dev/porter/internal/models"
-)
-
-// PreviewEnvironmentRepository represents the set of queries on the PreviewEnvironment model
-type PreviewEnvironmentRepository interface {
-	CreatePreviewEnvironment(a *models.PreviewEnvironment) (*models.PreviewEnvironment, error)
-}

internal/repository/repository.go

@@ -48,5 +48,4 @@ type Repository interface {
 	PorterApp() PorterAppRepository
 	PorterAppEvent() PorterAppEventRepository
 	EnvironmentConfig() EnvironmentConfigRepository
-	PreviewEnvironment() PreviewEnvironmentRepository
 }

internal/repository/test/preview_environment.go

@@ -1,22 +0,0 @@
-package test
-
-import (
-	"errors"
-	"strings"
-
-	"github.com/porter-dev/porter/internal/models"
-	"github.com/porter-dev/porter/internal/repository"
-)
-
-type PreviewEnvironmentRepository struct {
-	canQuery       bool
-	failingMethods string
-}
-
-func NewPreviewEnvironmentRepository(canQuery bool, failingMethods ...string) repository.PreviewEnvironmentRepository {
-	return &PreviewEnvironmentRepository{canQuery, strings.Join(failingMethods, ",")}
-}
-
-func (repo *PreviewEnvironmentRepository) CreatePreviewEnvironment(a *models.PreviewEnvironment) (*models.PreviewEnvironment, error) {
-	return nil, errors.New("cannot write database")
-}