coder · f0ssel · Mar 6, 2024 · Mar 1, 2024 · Mar 5, 2024 · Mar 5, 2024
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/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -1608,6 +1608,7 @@ func (s *MethodTestSuite) TestWorkspacePortSharing() {
 			AgentName:   ps.AgentName,
 			Port:        ps.Port,
 			ShareLevel:  ps.ShareLevel,
+			Protocol:    ps.Protocol,
 		}).Asserts(ws, rbac.ActionUpdate).Returns(ps)
 	}))
 	s.Run("GetWorkspaceAgentPortShare", s.Subtest(func(db database.Store, check *expects) {

diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -140,6 +140,7 @@ func WorkspaceAgentPortShare(t testing.TB, db database.Store, orig database.Work
 		AgentName:   takeFirst(orig.AgentName, namesgenerator.GetRandomName(1)),
 		Port:        takeFirst(orig.Port, 8080),
 		ShareLevel:  takeFirst(orig.ShareLevel, database.AppSharingLevelPublic),
+		Protocol:    takeFirst(orig.Protocol, database.PortShareProtocolHttp),
 	})
 	require.NoError(t, err, "insert workspace agent")
 	return ps

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -86,7 +86,7 @@ func New() database.Store {
 		UpdatedAt:   dbtime.Now(),
 	})
 	if err != nil {
-		panic(fmt.Errorf("failed to create default organization: %w", err))
+		panic(xerrors.Errorf("failed to create default organization: %w", err))
 	}
 	q.defaultProxyDisplayName = "Default"
 	q.defaultProxyIconURL = "/emojis/1f3e1.png"
@@ -7933,6 +7933,7 @@ func (q *FakeQuerier) UpsertWorkspaceAgentPortShare(_ context.Context, arg datab
 	for i, share := range q.workspaceAgentPortShares {
 		if share.WorkspaceID == arg.WorkspaceID && share.Port == arg.Port && share.AgentName == arg.AgentName {
 			share.ShareLevel = arg.ShareLevel
+			share.Protocol = arg.Protocol
 			q.workspaceAgentPortShares[i] = share
 			return share, nil
 		}
@@ -7944,6 +7945,7 @@ func (q *FakeQuerier) UpsertWorkspaceAgentPortShare(_ context.Context, arg datab
 		AgentName:   arg.AgentName,
 		Port:        arg.Port,
 		ShareLevel:  arg.ShareLevel,
+		Protocol:    arg.Protocol,
 	}
 	q.workspaceAgentPortShares = append(q.workspaceAgentPortShares, psl)
 

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000199_port_share_protocol.down.sql b/coderd/database/migrations/000199_port_share_protocol.down.sql
@@ -0,0 +1,3 @@
+ALTER TABLE workspace_agent_port_share DROP COLUMN protocol;
+
+DROP TYPE port_share_protocol;
diff --git a/coderd/database/migrations/000199_port_share_protocol.up.sql b/coderd/database/migrations/000199_port_share_protocol.up.sql
@@ -0,0 +1,4 @@
+CREATE TYPE port_share_protocol AS ENUM ('http', 'https');
+
+ALTER TABLE workspace_agent_port_share
+	ADD COLUMN protocol port_share_protocol NOT NULL DEFAULT 'http'::port_share_protocol;
diff --git a/coderd/database/models.go b/coderd/database/models.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE workspace_agent_port_share DROP COLUMN protocol;

		DROP TYPE port_share_protocol;