get claude off its nonsense

coder · aslilac · Jun 16, 2025 · Jun 10, 2025 · Jun 10, 2025 · Jun 10, 2025
commit 408d70d748edec1d25bf14ab6fcc3db9854aa8e2
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000334_add_organization_port_sharing_level.down.sql b/coderd/database/migrations/000334_add_organization_port_sharing_level.down.sql
@@ -1,113 +1,12 @@
--- Remove 'organization' from the app_sharing_level enum
-
--- Drop the view that depends on the templates table
-DROP VIEW template_with_names;
-
-CREATE TYPE new_app_sharing_level AS ENUM (
-	'owner',
-	'authenticated',
-	'public'
-);
-
--- Update workspace_agent_port_share table to use old enum
--- Convert any 'organization' values to 'authenticated' during downgrade
+-- Update columns to use the old enum, replacing 'organization' with 'owner'
 ALTER TABLE workspace_agent_port_share
-	ALTER COLUMN share_level TYPE new_app_sharing_level USING (
+	ALTER COLUMN share_level TYPE app_sharing_level USING (
 		CASE
-			WHEN share_level = 'organization' THEN 'authenticated'::new_app_sharing_level
-			ELSE share_level::text::new_app_sharing_level
+			WHEN share_level = 'organization' THEN 'owner'::app_sharing_level
+			ELSE share_level::text::app_sharing_level
 		END
 	);
 
--- Update workspace_apps table to use old enum
--- Convert any 'organization' values to 'authenticated' during downgrade
-ALTER TABLE workspace_apps
-	ALTER COLUMN sharing_level DROP DEFAULT,
-	ALTER COLUMN sharing_level TYPE new_app_sharing_level USING (
-		CASE
-			WHEN sharing_level = 'organization' THEN 'authenticated'::new_app_sharing_level
-			ELSE sharing_level::text::new_app_sharing_level
-		END
-	),
-	ALTER COLUMN sharing_level SET DEFAULT 'owner'::new_app_sharing_level;
-
--- Update templates table to use old enum
--- Convert any 'organization' values to 'authenticated' during downgrade
-ALTER TABLE templates
-	ALTER COLUMN max_port_sharing_level DROP DEFAULT,
-	ALTER COLUMN max_port_sharing_level TYPE new_app_sharing_level USING (
-		CASE
-			WHEN max_port_sharing_level = 'organization' THEN 'authenticated'::new_app_sharing_level
-			ELSE max_port_sharing_level::text::new_app_sharing_level
-		END
-	),
-	ALTER COLUMN max_port_sharing_level SET DEFAULT 'owner'::new_app_sharing_level;
-
--- Drop old enum and rename new one
-DROP TYPE app_sharing_level;
-ALTER TYPE new_app_sharing_level RENAME TO app_sharing_level;
-
--- Recreate the template_with_names view
-CREATE VIEW template_with_names AS
-SELECT
-    templates.id,
-    templates.created_at,
-    templates.updated_at,
-    templates.organization_id,
-    templates.deleted,
-    templates.name,
-    templates.provisioner,
-    templates.active_version_id,
-    templates.description,
-    templates.default_ttl,
-    templates.created_by,
-    templates.icon,
-    templates.user_acl,
-    templates.group_acl,
-    templates.display_name,
-    templates.allow_user_cancel_workspace_jobs,
-    templates.allow_user_autostart,
-    templates.allow_user_autostop,
-    templates.failure_ttl,
-    templates.time_til_dormant,
-    templates.time_til_dormant_autodelete,
-    templates.autostop_requirement_days_of_week,
-    templates.autostop_requirement_weeks,
-    templates.autostart_block_days_of_week,
-    templates.require_active_version,
-    templates.deprecated,
-    templates.activity_bump,
-    templates.max_port_sharing_level,
-    templates.use_classic_parameter_flow,
-    COALESCE(
-        visible_users.avatar_url,
-        ''::text
-    ) AS created_by_avatar_url,
-    COALESCE(
-        visible_users.username,
-        ''::text
-    ) AS created_by_username,
-    COALESCE(visible_users.name, ''::text) AS created_by_name,
-    COALESCE(organizations.name, ''::text) AS organization_name,
-    COALESCE(
-        organizations.display_name,
-        ''::text
-    ) AS organization_display_name,
-    COALESCE(organizations.icon, ''::text) AS organization_icon
-FROM (
-        (
-            templates
-            LEFT JOIN visible_users ON (
-                (
-                    templates.created_by = visible_users.id
-                )
-            )
-        )
-        LEFT JOIN organizations ON (
-            (
-                templates.organization_id = organizations.id
-            )
-        )
-    );
 
-COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
+-- Drop new enum
+DROP TYPE port_sharing_level;
diff --git a/coderd/database/migrations/000334_add_organization_port_sharing_level.up.sql b/coderd/database/migrations/000334_add_organization_port_sharing_level.up.sql
@@ -1,96 +1,12 @@
 -- Add 'organization' to the app_sharing_level enum
-
--- Drop the view that depends on the templates table
-DROP VIEW template_with_names;
-
-CREATE TYPE new_app_sharing_level AS ENUM (
+CREATE TYPE port_sharing_level AS ENUM (
 	'owner',
 	'authenticated',
 	'organization',
 	'public'
 );
 
--- Update workspace_agent_port_share table to use new enum
-ALTER TABLE workspace_agent_port_share
-	ALTER COLUMN share_level TYPE new_app_sharing_level USING (share_level::text::new_app_sharing_level);
-
--- Update workspace_apps table to use new enum
-ALTER TABLE workspace_apps
-	ALTER COLUMN sharing_level DROP DEFAULT,
-	ALTER COLUMN sharing_level TYPE new_app_sharing_level USING (sharing_level::text::new_app_sharing_level),
-	ALTER COLUMN sharing_level SET DEFAULT 'owner'::new_app_sharing_level;
 
--- Update templates table to use new enum
-ALTER TABLE templates
-	ALTER COLUMN max_port_sharing_level DROP DEFAULT,
-	ALTER COLUMN max_port_sharing_level TYPE new_app_sharing_level USING (max_port_sharing_level::text::new_app_sharing_level),
-	ALTER COLUMN max_port_sharing_level SET DEFAULT 'owner'::new_app_sharing_level;
-
--- Drop old enum and rename new one
-DROP TYPE app_sharing_level;
-ALTER TYPE new_app_sharing_level RENAME TO app_sharing_level;
-
--- Recreate the template_with_names view
-CREATE VIEW template_with_names AS
-SELECT
-    templates.id,
-    templates.created_at,
-    templates.updated_at,
-    templates.organization_id,
-    templates.deleted,
-    templates.name,
-    templates.provisioner,
-    templates.active_version_id,
-    templates.description,
-    templates.default_ttl,
-    templates.created_by,
-    templates.icon,
-    templates.user_acl,
-    templates.group_acl,
-    templates.display_name,
-    templates.allow_user_cancel_workspace_jobs,
-    templates.allow_user_autostart,
-    templates.allow_user_autostop,
-    templates.failure_ttl,
-    templates.time_til_dormant,
-    templates.time_til_dormant_autodelete,
-    templates.autostop_requirement_days_of_week,
-    templates.autostop_requirement_weeks,
-    templates.autostart_block_days_of_week,
-    templates.require_active_version,
-    templates.deprecated,
-    templates.activity_bump,
-    templates.max_port_sharing_level,
-    templates.use_classic_parameter_flow,
-    COALESCE(
-        visible_users.avatar_url,
-        ''::text
-    ) AS created_by_avatar_url,
-    COALESCE(
-        visible_users.username,
-        ''::text
-    ) AS created_by_username,
-    COALESCE(visible_users.name, ''::text) AS created_by_name,
-    COALESCE(organizations.name, ''::text) AS organization_name,
-    COALESCE(
-        organizations.display_name,
-        ''::text
-    ) AS organization_display_name,
-    COALESCE(organizations.icon, ''::text) AS organization_icon
-FROM (
-        (
-            templates
-            LEFT JOIN visible_users ON (
-                (
-                    templates.created_by = visible_users.id
-                )
-            )
-        )
-        LEFT JOIN organizations ON (
-            (
-                templates.organization_id = organizations.id
-            )
-        )
-    );
-
-COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
+-- Update columns to use the new enum
+ALTER TABLE workspace_agent_port_share
+	ALTER COLUMN share_level TYPE port_sharing_level USING (share_level::text::port_sharing_level);
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/workspaceapps/db.go b/coderd/workspaceapps/db.go
@@ -319,7 +319,7 @@
 	// For organization level path-based apps, block access if path app sharing is disabled
 	// and the user is not in the same organization
 	if isPathApp &&
-		sharingLevel == database.AppSharingLevelOrganization &&
+		sharingLevel == database.SharingLevelOrganization &&
 		!p.DeploymentValues.Dangerous.AllowPathAppSharing.Value() {
 		// Check if user is in the same organization as the workspace
 		workspaceOrgID := dbReq.Workspace.OrganizationID
@@ -380,7 +380,7 @@
 		if err == nil {
 			return true, []string{}, nil
 		}
 	case database.AppSharingLevelOrganization:
 		// Check if the user is a member of the same organization as the workspace
 		// First check if they have permission to connect to their own workspace (enforces scopes)
 		err := p.Authorizer.Authorize(ctx, *roles, rbacAction, rbacResourceOwned)

diff --git a/codersdk/workspaceagentportshare.go b/codersdk/workspaceagentportshare.go
@@ -9,19 +9,23 @@ import (
 	"github.com/google/uuid"
 )
 
+type WorkspaceAgentPortShareLevel string
+
 const (
 	WorkspaceAgentPortShareLevelOwner         WorkspaceAgentPortShareLevel = "owner"
 	WorkspaceAgentPortShareLevelAuthenticated WorkspaceAgentPortShareLevel = "authenticated"
 	WorkspaceAgentPortShareLevelOrganization  WorkspaceAgentPortShareLevel = "organization"
 	WorkspaceAgentPortShareLevelPublic        WorkspaceAgentPortShareLevel = "public"
+)
 
+type WorkspaceAgentPortShareProtocol string
+
+const (
 	WorkspaceAgentPortShareProtocolHTTP  WorkspaceAgentPortShareProtocol = "http"
 	WorkspaceAgentPortShareProtocolHTTPS WorkspaceAgentPortShareProtocol = "https"
 )
 
 type (
-	WorkspaceAgentPortShareLevel         string
-	WorkspaceAgentPortShareProtocol      string
 	UpsertWorkspaceAgentPortShareRequest struct {
 		AgentName  string                          `json:"agent_name"`
 		Port       int32                           `json:"port"`