Skip to content

Commit 42c2c71

Browse files
committed
feat(go): update argocd lib to 3.1.6 instead of 3.0.6
Signed-off-by: Nathanael Liechti <technat@technat.ch>
1 parent b863da9 commit 42c2c71

File tree

6 files changed

+323
-362
lines changed

6 files changed

+323
-362
lines changed

argocd/model_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func (p ArgoCDProviderConfig) getApiClientOptions(ctx context.Context) (*apiclie
123123
runtime.ErrorHandlers = runtimeErrorHandlers
124124
}
125125

126-
err := headless.MaybeStartLocalServer(ctx, opts, "", nil, nil, nil)
126+
_, err := headless.MaybeStartLocalServer(ctx, opts, "", nil, nil, nil)
127127
if err != nil {
128128
diags.Append(diagnostics.Error("failed to start local server", err)...)
129129
return nil, diags

argocd/structure_application.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,16 @@ func flattenApplicationConditions(aacs []application.ApplicationCondition) []map
971971
return acs
972972
}
973973

974-
func flattenApplicationHealthStatus(hs application.HealthStatus) []map[string]interface{} {
974+
func flattenHealthStatus(hs application.HealthStatus) []map[string]interface{} {
975+
h := map[string]interface{}{
976+
"message": hs.Message,
977+
"status": hs.Status,
978+
}
979+
980+
return []map[string]interface{}{h}
981+
}
982+
983+
func flattenApplicationHealthStatus(hs application.AppHealthStatus) []map[string]interface{} {
975984
h := map[string]interface{}{
976985
"message": hs.Message,
977986
"status": hs.Status,
@@ -1007,7 +1016,7 @@ func flattenApplicationResourceStatuses(arss []application.ResourceStatus) []map
10071016
}
10081017

10091018
if v.Health != nil {
1010-
rss[i]["health"] = flattenApplicationHealthStatus(*v.Health)
1019+
rss[i]["health"] = flattenHealthStatus(*v.Health)
10111020
}
10121021
}
10131022

0 commit comments

Comments
 (0)