Skip to content
This repository has been archived by the owner on Aug 12, 2022. It is now read-only.

chore!: Remove HCL config support #424

Merged
merged 2 commits into from
Jul 19, 2022
Merged

chore!: Remove HCL config support #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e776e9d
chore!: Remove HCL config support
disq Jul 19, 2022
988232b
backwards compatibility with older cores
disq Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 3 additions & 28 deletions cqproto/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,14 @@ func (g GRPCClient) GetProviderSchema(ctx context.Context, _ *GetProviderSchemaR
}

func (g GRPCClient) GetProviderConfig(ctx context.Context, request *GetProviderConfigRequest) (*GetProviderConfigResponse, error) {
res, err := g.client.GetProviderConfig(ctx, &internal.GetProviderConfig_Request{
Format: configFormatFromProto(request.Format),
})
res, err := g.client.GetProviderConfig(ctx, &internal.GetProviderConfig_Request{})
if err != nil {
return nil, err
}

return &GetProviderConfigResponse{
Config: res.GetConfig(),
Format: configFormatToProto(res.GetFormat()),
Format: 1, // YAML - Deprecated
}, nil
}

Expand All @@ -66,7 +64,6 @@ func (g GRPCClient) ConfigureProvider(ctx context.Context, request *ConfigurePro
Dsn: request.Connection.DSN,
},
Config: request.Config,
Format: configFormatFromProto(request.Format),
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -145,16 +142,13 @@ func (g *GRPCServer) GetProviderSchema(ctx context.Context, _ *internal.GetProvi
}

func (g *GRPCServer) GetProviderConfig(ctx context.Context, request *internal.GetProviderConfig_Request) (*internal.GetProviderConfig_Response, error) {
resp, err := g.Impl.GetProviderConfig(ctx, &GetProviderConfigRequest{
Format: configFormatToProto(request.Format),
})
resp, err := g.Impl.GetProviderConfig(ctx, &GetProviderConfigRequest{})
if err != nil {
return nil, err
}

return &internal.GetProviderConfig_Response{
Config: resp.Config,
Format: configFormatFromProto(resp.Format),
}, nil
}

Expand All @@ -166,7 +160,6 @@ func (g *GRPCServer) ConfigureProvider(ctx context.Context, request *internal.Co
DSN: request.Connection.GetDsn(),
},
Config: request.Config,
Format: configFormatToProto(request.Format),
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -467,21 +460,3 @@ func moduleInfoToProto(in map[uint32]ModuleInfo) map[uint32]*internal.GetModuleI
}
return ret
}

func configFormatFromProto(in ConfigFormat) internal.ConfigFormat {
switch in {
case ConfigYAML:
return internal.ConfigFormat_YAML
default:
return internal.ConfigFormat_HCL
}
}

func configFormatToProto(in internal.ConfigFormat) ConfigFormat {
switch in {
case internal.ConfigFormat_YAML:
return ConfigYAML
default:
return ConfigHCL
}
}
Loading