Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit579525d

Browse files
committed
oh boy
1 parent715e6f2 commit579525d

File tree

9 files changed

+746
-619
lines changed

9 files changed

+746
-619
lines changed

‎coderd/database/migrations/000188_external_auth_providers_jsonb.down.sql

Whitespace-only changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ALTERTABLE template_versions
2+
ALTER COLUMN external_auth_providers type jsonb
3+
using to_jsonb(external_auth_providers);
4+
-- so, that will give us ["foo"], but now we need
5+
-- {"github": {optional: false}} or [{id: "github", optional: false}]

‎codersdk/templateversions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ type TemplateVersionExternalAuth struct {
4141
DisplayIconstring`json:"display_icon"`
4242
AuthenticateURLstring`json:"authenticate_url"`
4343
Authenticatedbool`json:"authenticated"`
44+
Optionalbool`json:"optional"`
4445
}
4546

4647
typeValidationMonotonicOrderstring

‎provisioner/terraform/resources.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ type resourceMetadataItem struct {
122122
typeStatestruct {
123123
Resources []*proto.Resource
124124
Parameters []*proto.RichParameter
125-
ExternalAuthProviders []string
125+
ExternalAuthProviders []*proto.ExternalAuthProviderResource
126126
}
127127

128128
// ConvertState consumes Terraform state and a GraphViz representation
@@ -693,7 +693,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
693693
}
694694

695695
// A map is used to ensure we don't have duplicates!
696-
externalAuthProvidersMap:=map[string]struct{}{}
696+
externalAuthProvidersMap:=map[string]*proto.ExternalAuthProviderResource{}
697697
for_,tfResources:=rangetfResourcesByLabel {
698698
for_,resource:=rangetfResources {
699699
// Checking for `coder_git_auth` is legacy!
@@ -704,12 +704,18 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
704704
if!ok {
705705
returnnil,xerrors.Errorf("external auth id is not a string")
706706
}
707-
externalAuthProvidersMap[id]=struct{}{}
707+
708+
optional:=false
709+
optionalAttribute,ok:=resource.AttributeValues["optional"].(bool)
710+
ifok {
711+
optional=optionalAttribute
712+
}
713+
externalAuthProvidersMap[id]=&proto.ExternalAuthProviderResource{Optional:optional}
708714
}
709715
}
710-
externalAuthProviders:=make([]string,0,len(externalAuthProvidersMap))
711-
forid:=rangeexternalAuthProvidersMap {
712-
externalAuthProviders=append(externalAuthProviders,id)
716+
externalAuthProviders:=make([]*proto.ExternalAuthProviderResource,0,len(externalAuthProvidersMap))
717+
for_,provider:=rangeexternalAuthProvidersMap {
718+
externalAuthProviders=append(externalAuthProviders,provider)
713719
}
714720

715721
return&State{

‎provisionerd/proto/provisionerd.pb.go

Lines changed: 161 additions & 144 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎provisionerd/proto/provisionerd.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ message CompletedJob {
7777
repeatedprovisioner.Resourcestart_resources=1;
7878
repeatedprovisioner.Resourcestop_resources=2;
7979
repeatedprovisioner.RichParameterrich_parameters=3;
80-
repeatedstringexternal_auth_providers=4;
80+
repeatedstringexternal_auth_providers_names=4;
81+
repeatedprovisioner.ExternalAuthProviderResourceexternal_auth_providers=5;
8182
}
8283
messageTemplateDryRun {
8384
repeatedprovisioner.Resourceresources=1;

‎provisionerd/proto/version.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp