feat(hydrator): write credentials handling + UI

Signed-off-by: Michael Crenshaw <[email protected]>
argoproj · Sep 30, 2024 · 41bc547 · 41bc547
1 parent b642ed7
commit 41bc547
Show file tree

Hide file tree

Showing 26 changed files with 1,120 additions and 171 deletions.
diff --git a/assets/swagger.json b/assets/swagger.json
diff --git a/controller/appcontroller.go b/controller/appcontroller.go
@@ -2095,7 +2095,8 @@ func currentSourceEqualsSyncedSource(app *appv1.Application) bool {
  if app.Spec.HasMultipleSources() {
  return app.Spec.Sources.Equals(app.Status.Sync.ComparedTo.Sources)
  }
- return app.Spec.Source.Equals(&app.Status.Sync.ComparedTo.Source)
+ source := app.Spec.GetSource()
+ return source.Equals(&app.Status.Sync.ComparedTo.Source)
 }
 
 // needRefreshAppStatus answers if application status needs to be refreshed.
@@ -2259,6 +2260,7 @@ func (ctrl *ApplicationController) persistAppStatus(orig *appv1.Application, new
  newAnnotations[k] = v
  }
  delete(newAnnotations, appv1.AnnotationKeyRefresh)
+ delete(newAnnotations, appv1.AnnotationKeyHydrate)
  }
  patch, modified, err := createMergePatch(
  &appv1.Application{ObjectMeta: metav1.ObjectMeta{Annotations: orig.GetAnnotations()}, Status: orig.Status},

diff --git a/controller/appcontroller_test.go b/controller/appcontroller_test.go
@@ -168,6 +168,7 @@ func newFakeController(data *fakeData, repoErr error) *ApplicationController {
  false,
  false,
  normalizers.IgnoreNormalizerOpts{},
+ false,
  )
  db := &dbmocks.ArgoDB{}
  db.On("GetApplicationControllerReplicas").Return(1)

diff --git a/controller/sync_test.go b/controller/sync_test.go
@@ -54,7 +54,7 @@ func TestPersistRevisionHistory(t *testing.T) {
 
  updatedApp, err := ctrl.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(context.Background(), app.Name, v1.GetOptions{})
  require.NoError(t, err)
- assert.Len(t, updatedApp.Status.History, 1)
+ require.Len(t, updatedApp.Status.History, 1)
  assert.Equal(t, app.Spec.GetSource(), updatedApp.Status.History[0].Source)
  assert.Equal(t, "abc123", updatedApp.Status.History[0].Revision)
 }