updates

cqproto/grpc.go

@@ -44,22 +44,17 @@ func (g GRPCClient) GetProviderSchema(ctx context.Context, _ *GetProviderSchemaR
 	return resp, nil
 }
 
-func (g GRPCClient) GetProviderConfig(ctx context.Context, _ *GetProviderConfigRequest) (*GetProviderConfigResponse, error) {
-	res, err := g.client.GetProviderConfig(ctx, &internal.GetProviderConfig_Request{})
+func (g GRPCClient) GetProviderConfig(ctx context.Context, request *GetProviderConfigRequest) (*GetProviderConfigResponse, error) {
+	res, err := g.client.GetProviderConfig(ctx, &internal.GetProviderConfig_Request{
+		Format: configFormatFromProto(request.Format),
+	})
 	if err != nil {
 		return nil, err
 	}
 
 	return &GetProviderConfigResponse{
 		Config: res.GetConfig(),
-		Format: func(f internal.GetProviderConfig_Format) ConfigFormat {
-			switch f {
-			case internal.GetProviderConfig_HCL:
-				return ConfigHCL
-			default:
-				return ConfigYAML
-			}
-		}(res.GetFormat()),
+		Format: configFormatToProto(res.GetFormat()),
 	}, nil
 }
 
@@ -76,6 +71,7 @@ func (g GRPCClient) ConfigureProvider(ctx context.Context, request *ConfigurePro
 		},
 		Config:      request.Config,
 		ExtraFields: fieldsData,
+		Format:      configFormatFromProto(request.Format),
 	})
 	if err != nil {
 		return nil, err
@@ -153,19 +149,17 @@ func (g *GRPCServer) GetProviderSchema(ctx context.Context, _ *internal.GetProvi
 	}, nil
 }
 
-func (g *GRPCServer) GetProviderConfig(ctx context.Context, _ *internal.GetProviderConfig_Request) (*internal.GetProviderConfig_Response, error) {
-	resp, err := g.Impl.GetProviderConfig(ctx, &GetProviderConfigRequest{})
+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),
+	})
 	if err != nil {
 		return nil, err
 	}
-	f := internal.GetProviderConfig_YAML
-	if resp.Format == ConfigHCL {
-		f = internal.GetProviderConfig_HCL
-	}
 
 	return &internal.GetProviderConfig_Response{
 		Config: resp.Config,
-		Format: f,
+		Format: configFormatFromProto(resp.Format),
 	}, nil
 }
 
@@ -184,6 +178,7 @@ func (g *GRPCServer) ConfigureProvider(ctx context.Context, request *internal.Co
 		},
 		Config:      request.Config,
 		ExtraFields: eFields,
+		Format:      configFormatToProto(request.Format),
 	})
 	if err != nil {
 		return nil, err
@@ -484,3 +479,21 @@ 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
+	}
+}