Merge branch 'nafees/preview-env-token' into dev

api/server/handlers/environment/create.go

@@ -178,6 +178,7 @@ func (c *CreateEnvironmentHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		ClusterID:         cluster.ID,
 		GitInstallationID: uint(ga.InstallationID),
 		EnvironmentName:   request.Name,
+		InstanceName:      c.Config().ServerConf.InstanceName,
 	})
 
 	if err != nil {

api/server/handlers/environment/delete.go

@@ -129,6 +129,7 @@ func (c *DeleteEnvironmentHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		ClusterID:         cluster.ID,
 		GitInstallationID: uint(ga.InstallationID),
 		EnvironmentName:   env.Name,
+		InstanceName:      c.Config().ServerConf.InstanceName,
 	})
 
 	if err != nil {

api/server/handlers/registry/list_images.go

@@ -1,7 +1,9 @@
 package registry
 
 import (
+	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/porter-dev/porter/api/server/handlers"
 	"github.com/porter-dev/porter/api/server/shared"
@@ -37,7 +39,10 @@ func (c *RegistryListImagesHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 
 	imgs, err := regAPI.ListImages(repoName, c.Repo(), c.Config().DOConf)
 
-	if err != nil {
+	if err != nil && strings.Contains(err.Error(), "RepositoryNotFoundException") {
+		c.HandleAPIError(w, r, apierrors.NewErrNotFound(fmt.Errorf("no such repository: %s", repoName)))
+		return
+	} else if err != nil {
 		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
 		return
 	}

cli/cmd/apply.go

@@ -762,7 +762,9 @@ func (t *DeploymentHook) PreApply() error {
 	envs := *envList
 
 	for _, env := range envs {
-		if env.GitRepoOwner == t.repoOwner && env.GitRepoName == t.repoName && env.GitInstallationID == t.gitInstallationID {
+		if strings.EqualFold(env.GitRepoOwner, t.repoOwner) &&
+			strings.EqualFold(env.GitRepoName, t.repoName) &&
+			env.GitInstallationID == t.gitInstallationID {
 			t.envID = env.ID
 			break
 		}

internal/integrations/ci/actions/preview.go

@@ -17,6 +17,7 @@ type EnvOpts struct {
 	PorterToken                             string
 	GitRepoOwner, GitRepoName               string
 	EnvironmentName                         string
+	InstanceName                            string
 	ProjectID, ClusterID, GitInstallationID uint
 }
 
@@ -44,7 +45,7 @@ func SetupEnv(opts *EnvOpts) error {
 	// create porter token secret
 	err = createGithubSecret(
 		opts.Client,
-		getPorterTokenSecretName(opts.ProjectID),
+		getPreviewEnvSecretName(opts.ProjectID, opts.ClusterID, opts.InstanceName),
 		opts.PorterToken,
 		opts.GitRepoOwner,
 		opts.GitRepoName,
@@ -211,18 +212,26 @@ func DeleteEnv(opts *EnvOpts) error {
 	)
 }
 
+func getPreviewEnvSecretName(projectID, clusterID uint, instanceName string) string {
+	if instanceName != "" {
+		return fmt.Sprintf("PORTER_PREVIEW_%s_%d_%d", strings.ToUpper(instanceName), projectID, clusterID)
+	}
+
+	return fmt.Sprintf("PORTER_PREVIEW_%d_%d", projectID, clusterID)
+}
+
 func getPreviewApplyActionYAML(opts *EnvOpts) ([]byte, error) {
 	gaSteps := []GithubActionYAMLStep{
 		getCheckoutCodeStep(),
 		getCreatePreviewEnvStep(
 			opts.ServerURL,
-			getPorterTokenSecretName(opts.ProjectID),
+			getPreviewEnvSecretName(opts.ProjectID, opts.ClusterID, opts.InstanceName),
 			opts.ProjectID,
 			opts.ClusterID,
 			opts.GitInstallationID,
 			opts.GitRepoOwner,
 			opts.GitRepoName,
-			"v0.2.0",
+			"v0.2.1",
 		),
 	}
 

internal/opa/config.yaml

@@ -97,15 +97,13 @@ porter_agent_pod:
   policies:
   - path: "./policies/pod/running.rego"
     name: "pod.running"
-porter_agent_redis_pod:
+porter_agent_loki_pod:
   kind: "pod"
   match:
     namespace: porter-agent-system
     labels:
-      app.kubernetes.io/component: "master"
-      app.kubernetes.io/instance: "porter-agent"
-      app.kubernetes.io/managed-by: "Helm"
-      app.kubernetes.io/name: "redis"
+      app: "loki"
+      name: "porter-agent-loki"
   policies:
   - path: "./policies/pod/running.rego"
     name: "pod.running"