fix secrets import (airbytehq#6643)

* fix * fmt
schlattk · Jan 4, 2022 · bcbcb6f · bcbcb6f
1 parent 29a7e95
commit bcbcb6f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java
@@ -494,21 +494,24 @@ public void replaceAllConfigs(final Map<AirbyteConfig, Stream<?>> configs, final
           }));
 
       if (augmentedMap.containsKey(ConfigSchema.SOURCE_CONNECTION)) {
-        final Stream<JsonNode> augmentedValue = augmentedMap.get(ConfigSchema.SOURCE_CONNECTION)
+        final Stream<?> augmentedValue = augmentedMap.get(ConfigSchema.SOURCE_CONNECTION)
             .map(config -> {
               final SourceConnection source = (SourceConnection) config;
 
               if (!sourceDefIdToSpec.containsKey(source.getSourceDefinitionId())) {
                 throw new RuntimeException(new ConfigNotFoundException(ConfigSchema.STANDARD_SOURCE_DEFINITION, source.getSourceDefinitionId()));
               }
 
-              return statefulSplitSecrets(source.getWorkspaceId(), source.getConfiguration(), sourceDefIdToSpec.get(source.getSourceDefinitionId()));
+              final var connectionConfig =
+                  statefulSplitSecrets(source.getWorkspaceId(), source.getConfiguration(), sourceDefIdToSpec.get(source.getSourceDefinitionId()));
+
+              return source.withConfiguration(connectionConfig);
             });
         augmentedMap.put(ConfigSchema.SOURCE_CONNECTION, augmentedValue);
       }
 
       if (augmentedMap.containsKey(ConfigSchema.DESTINATION_CONNECTION)) {
-        final Stream<JsonNode> augmentedValue = augmentedMap.get(ConfigSchema.DESTINATION_CONNECTION)
+        final Stream<?> augmentedValue = augmentedMap.get(ConfigSchema.DESTINATION_CONNECTION)
             .map(config -> {
               final DestinationConnection destination = (DestinationConnection) config;
 
@@ -517,8 +520,10 @@ public void replaceAllConfigs(final Map<AirbyteConfig, Stream<?>> configs, final
                     new ConfigNotFoundException(ConfigSchema.STANDARD_DESTINATION_DEFINITION, destination.getDestinationDefinitionId()));
               }
 
-              return statefulSplitSecrets(destination.getWorkspaceId(), destination.getConfiguration(),
+              final var connectionConfig = statefulSplitSecrets(destination.getWorkspaceId(), destination.getConfiguration(),
                   destinationDefIdToSpec.get(destination.getDestinationDefinitionId()));
+
+              return destination.withConfiguration(connectionConfig);
             });
         augmentedMap.put(ConfigSchema.DESTINATION_CONNECTION, augmentedValue);
       }