From ab9d0500536fac53dece65a529f61dbd7075a85e Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 25 Sep 2024 15:17:51 -0500 Subject: [PATCH 1/5] chore: rename 'first-organization' to 'main' --- coderd/database/dbmem/dbmem.go | 4 ++-- .../migrations/000259_rename_first_organization.down.sql | 0 .../migrations/000259_rename_first_organization.up.sql | 9 +++++++++ enterprise/cli/create_test.go | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 coderd/database/migrations/000259_rename_first_organization.down.sql create mode 100644 coderd/database/migrations/000259_rename_first_organization.up.sql diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go index dbf8e5514ea2e..5edf25226d168 100644 --- a/coderd/database/dbmem/dbmem.go +++ b/coderd/database/dbmem/dbmem.go @@ -92,8 +92,8 @@ func New() database.Store { // Always start with a default org. Matching migration 198. defaultOrg, err := q.InsertOrganization(context.Background(), database.InsertOrganizationParams{ ID: uuid.New(), - Name: "first-organization", - DisplayName: "first-organization", + Name: "main", + DisplayName: "Main", Description: "Builtin default organization.", Icon: "", CreatedAt: dbtime.Now(), diff --git a/coderd/database/migrations/000259_rename_first_organization.down.sql b/coderd/database/migrations/000259_rename_first_organization.down.sql new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/coderd/database/migrations/000259_rename_first_organization.up.sql b/coderd/database/migrations/000259_rename_first_organization.up.sql new file mode 100644 index 0000000000000..2930815791302 --- /dev/null +++ b/coderd/database/migrations/000259_rename_first_organization.up.sql @@ -0,0 +1,9 @@ +UPDATE + organizations +SET + name = 'main', + display_name = 'Main' +WHERE + -- The old name was too long. + name = 'first-organization' +; diff --git a/enterprise/cli/create_test.go b/enterprise/cli/create_test.go index 33423e366a538..f4fb3edaa68ee 100644 --- a/enterprise/cli/create_test.go +++ b/enterprise/cli/create_test.go @@ -202,6 +202,6 @@ func TestEnterpriseCreate(t *testing.T) { err := inv.Run() require.Error(t, err) // The error message should indicate the flag to fix the issue. - require.ErrorContains(t, err, fmt.Sprintf("--org=%q", "first-organization")) + require.ErrorContains(t, err, fmt.Sprintf("--org=%q", "main")) }) } From f18dcb9061a0b22e526f4a4a834d8550301cec8a Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 25 Sep 2024 15:20:51 -0500 Subject: [PATCH 2/5] chore: migration to rename --- .../migrations/000259_rename_first_organization.down.sql | 3 +++ .../migrations/000259_rename_first_organization.up.sql | 1 + 2 files changed, 4 insertions(+) diff --git a/coderd/database/migrations/000259_rename_first_organization.down.sql b/coderd/database/migrations/000259_rename_first_organization.down.sql index e69de29bb2d1d..9ad0324edbc16 100644 --- a/coderd/database/migrations/000259_rename_first_organization.down.sql +++ b/coderd/database/migrations/000259_rename_first_organization.down.sql @@ -0,0 +1,3 @@ +-- Leave the name as 'main', there is no downside. +-- The old name 'first-organization' is not used anywhere, just the +-- is_default property. diff --git a/coderd/database/migrations/000259_rename_first_organization.up.sql b/coderd/database/migrations/000259_rename_first_organization.up.sql index 2930815791302..6eac50c12dc0a 100644 --- a/coderd/database/migrations/000259_rename_first_organization.up.sql +++ b/coderd/database/migrations/000259_rename_first_organization.up.sql @@ -6,4 +6,5 @@ SET WHERE -- The old name was too long. name = 'first-organization' + AND is_default = true ; From 6196320d5ab248c0a45cadbd45130fe14ec09430 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 26 Sep 2024 10:21:08 -0500 Subject: [PATCH 3/5] update golden files --- cli/testdata/coder_list_--output_json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/testdata/coder_list_--output_json.golden b/cli/testdata/coder_list_--output_json.golden index c65c1cd61db80..4b5908d6b10e3 100644 --- a/cli/testdata/coder_list_--output_json.golden +++ b/cli/testdata/coder_list_--output_json.golden @@ -7,7 +7,7 @@ "owner_name": "testuser", "owner_avatar_url": "", "organization_id": "[first org ID]", - "organization_name": "first-organization", + "organization_name": "main", "template_id": "[template ID]", "template_name": "test-template", "template_display_name": "", From f79597408f5eae22f9abead45f36d933ebd468fa Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 26 Sep 2024 10:30:54 -0500 Subject: [PATCH 4/5] change to 'coder' --- cli/testdata/coder_list_--output_json.golden | 2 +- coderd/database/dbmem/dbmem.go | 4 ++-- .../migrations/000259_rename_first_organization.up.sql | 4 ++-- enterprise/cli/create_test.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/testdata/coder_list_--output_json.golden b/cli/testdata/coder_list_--output_json.golden index 4b5908d6b10e3..8f45fd79cfd5a 100644 --- a/cli/testdata/coder_list_--output_json.golden +++ b/cli/testdata/coder_list_--output_json.golden @@ -7,7 +7,7 @@ "owner_name": "testuser", "owner_avatar_url": "", "organization_id": "[first org ID]", - "organization_name": "main", + "organization_name": "coder", "template_id": "[template ID]", "template_name": "test-template", "template_display_name": "", diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go index 5edf25226d168..6500fb32784ba 100644 --- a/coderd/database/dbmem/dbmem.go +++ b/coderd/database/dbmem/dbmem.go @@ -92,8 +92,8 @@ func New() database.Store { // Always start with a default org. Matching migration 198. defaultOrg, err := q.InsertOrganization(context.Background(), database.InsertOrganizationParams{ ID: uuid.New(), - Name: "main", - DisplayName: "Main", + Name: "coder", + DisplayName: "Coder", Description: "Builtin default organization.", Icon: "", CreatedAt: dbtime.Now(), diff --git a/coderd/database/migrations/000259_rename_first_organization.up.sql b/coderd/database/migrations/000259_rename_first_organization.up.sql index 6eac50c12dc0a..84bd45373cd8d 100644 --- a/coderd/database/migrations/000259_rename_first_organization.up.sql +++ b/coderd/database/migrations/000259_rename_first_organization.up.sql @@ -1,8 +1,8 @@ UPDATE organizations SET - name = 'main', - display_name = 'Main' + name = 'coder', + display_name = 'Coder' WHERE -- The old name was too long. name = 'first-organization' diff --git a/enterprise/cli/create_test.go b/enterprise/cli/create_test.go index f4fb3edaa68ee..1c0804e4d92eb 100644 --- a/enterprise/cli/create_test.go +++ b/enterprise/cli/create_test.go @@ -202,6 +202,6 @@ func TestEnterpriseCreate(t *testing.T) { err := inv.Run() require.Error(t, err) // The error message should indicate the flag to fix the issue. - require.ErrorContains(t, err, fmt.Sprintf("--org=%q", "main")) + require.ErrorContains(t, err, fmt.Sprintf("--org=%q", "coder")) }) } From b570f501a6dac5f4bf5cfd9625d14b152fffe635 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 26 Sep 2024 11:20:04 -0500 Subject: [PATCH 5/5] fix comment --- .../migrations/000259_rename_first_organization.down.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/database/migrations/000259_rename_first_organization.down.sql b/coderd/database/migrations/000259_rename_first_organization.down.sql index 9ad0324edbc16..e76e68e8b8174 100644 --- a/coderd/database/migrations/000259_rename_first_organization.down.sql +++ b/coderd/database/migrations/000259_rename_first_organization.down.sql @@ -1,3 +1,3 @@ --- Leave the name as 'main', there is no downside. +-- Leave the name as 'coder', there is no downside. -- The old name 'first-organization' is not used anywhere, just the -- is_default property.