Add fallback if we fail to convert github list to a curl string (#257)

openshift · Jul 19, 2024 · 8024971 · 8024971
1 parent 0069dfe
commit 8024971
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/pkg/verifier/aws/entry_point.go b/pkg/verifier/aws/entry_point.go
@@ -131,32 +131,30 @@ func (a *AwsVerifier) ValidateEgress(vei verifier.ValidateEgressInput) *output.O
 	// Note that this is TOTALLY IGNORED by LegacyProbe,
 	// as that probe only knows how to use the egress URL lists baked into its
 	// AMIs/container images
-	var egressListYaml string
-	if vei.EgressListYaml != "" {
-		egressListYaml = vei.EgressListYaml
-	} else {
-		githubEgressList, err := egress_lists.GetGithubEgressList(vei.PlatformType)
-		if err != nil {
-			a.Logger.Error(vei.Ctx, "Failed to get egress list from GitHub, falling back to local list: %v", err)
-		} else {
-			egressListYaml, err = githubEgressList.GetContent()
-			if err != nil {
-				a.Logger.Error(vei.Ctx, "Failed to get egress list from GitHub, falling back to local list: %v", err)
+	egressListYaml := vei.EgressListYaml
+	var egressListStr, tlsDisabledEgressListStr string
+	if egressListYaml == "" {
+		githubEgressList, githubListErr := egress_lists.GetGithubEgressList(vei.PlatformType)
+		if githubListErr == nil {
+			egressListYaml, githubListErr = githubEgressList.GetContent()
+			if githubListErr == nil {
+				a.Logger.Info(vei.Ctx, "Using egress URL list from %s at SHA %s", githubEgressList.GetURL(), githubEgressList.GetSHA())
+				egressListStr, tlsDisabledEgressListStr, githubListErr = egress_lists.EgressListToString(egressListYaml, map[string]string{"AWS_REGION": a.AwsClient.Region})
 			}
-			a.Logger.Info(vei.Ctx, "Using egress URL list from %s at SHA %s", githubEgressList.GetURL(), githubEgressList.GetSHA())
 		}
 
-		if egressListYaml == "" {
+		if githubListErr != nil {
+			a.Logger.Error(vei.Ctx, "Failed to get egress list from GitHub, falling back to local list: %v", githubListErr)
 			egressListYaml, err = egress_lists.GetLocalEgressList(vei.PlatformType)
 			if err != nil {
 				return a.Output.AddError(err)
 			}
+			egressListStr, tlsDisabledEgressListStr, err = egress_lists.EgressListToString(egressListYaml, map[string]string{"AWS_REGION": a.AwsClient.Region})
+			if err != nil {
+				return a.Output.AddError(err)
+			}
 		}
 	}
-	egressListStr, tlsDisabledEgressListStr, err := egress_lists.EgressListToString(egressListYaml, map[string]string{"AWS_REGION": a.AwsClient.Region})
-	if err != nil {
-		return a.Output.AddError(err)
-	}
 
 	// Generate the userData file
 	// As expand replaces all ${var} (using empty string for unknown ones), adding the env variables used in userdata.yaml