fix(cli): Send sync time to new sources (#10796)

yevgenypats · web-flow · commit 8d9b5be519f6 · 2023-05-15T16:56:27.000Z
Fixes version check in the new CLI and send sync time new sources.
diff --git a/cli/cmd/sync.go b/cli/cmd/sync.go
@@ -108,8 +108,8 @@ func sync(cmd *cobra.Command, args []string) error {
 				if err != nil {
 					return fmt.Errorf("failed to get destination versions: %w", err)
 				}
-				if !slices.Contains(versions, 2) {
-					return fmt.Errorf("destination %[1]s does not support CloudQuery SDK version 2. Please upgrade to newer version of %[1]s", destination.Spec.Name)
+				if !slices.Contains(versions, 1) {
+					return fmt.Errorf("destination %[1]s does not support CloudQuery SDK version 1. Please upgrade to newer version of %[1]s", destination.Spec.Name)
 				}
 			}
 			if err := syncConnectionV2(ctx, cl, destinationsClients, invocationUUID.String(), noMigrate); err != nil {
diff --git a/cli/cmd/sync_v2.go b/cli/cmd/sync_v2.go
@@ -88,7 +88,9 @@ func syncConnectionV2(ctx context.Context, sourceClient *managedsource.Client, d
 	log.Info().Str("source", sourceSpec.VersionString()).Strs("destinations", destinationStrings).Msg("Start fetching resources")
 	fmt.Printf("Starting sync for: %s -> %s\n", sourceSpec.VersionString(), destinationStrings)
 
-	syncClient, err := sourcePbClient.Sync(ctx, &source.Sync_Request{})
+	syncClient, err := sourcePbClient.Sync(ctx, &source.Sync_Request{
+		SyncTime: timestamppb.New(syncTime),
+	})
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,8 @@ func sync(cmd *cobra.Command, args []string) error {`
`108`	`108`	`if err != nil {`
`109`	`109`	`return fmt.Errorf("failed to get destination versions: %w", err)`
`110`	`110`	`}`
`111`		`- if !slices.Contains(versions, 2) {`
`112`		`- return fmt.Errorf("destination %[1]s does not support CloudQuery SDK version 2. Please upgrade to newer version of %[1]s", destination.Spec.Name)`
	`111`	`+ if !slices.Contains(versions, 1) {`
	`112`	`+ return fmt.Errorf("destination %[1]s does not support CloudQuery SDK version 1. Please upgrade to newer version of %[1]s", destination.Spec.Name)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`if err := syncConnectionV2(ctx, cl, destinationsClients, invocationUUID.String(), noMigrate); err != nil {`