Merge pull request #808 from abyrne55/SREP-2372

Fix servicelog link validation for blocked egress URLs

Author: openshift-merge-bot[bot]

cmd/network/verification.go

@@ -310,6 +310,7 @@ func generateServiceLog(out *output.Output, clusterId string) servicelog.PostCmd
 			Template:       blockedEgressTemplateUrl,
 			ClusterId:      clusterId,
 			TemplateParams: []string{fmt.Sprintf("URLS=%v", strings.Join(egressUrls, ","))},
+			SkipLinkCheck:  true,
 		}
 	}
 	return servicelog.PostCmdOptions{}

cmd/network/verification_test.go

@@ -572,6 +572,7 @@ func Test_generateServiceLog(t *testing.T) {
 				Template:       blockedEgressTemplateUrl,
 				TemplateParams: []string{"URLS=storage.googleapis.com:443"},
 				ClusterId:      testClusterId,
+				SkipLinkCheck:  true,
 			},
 		},
 		{
@@ -585,6 +586,7 @@ func Test_generateServiceLog(t *testing.T) {
 				Template:       blockedEgressTemplateUrl,
 				TemplateParams: []string{"URLS=storage.googleapis.com:443,console.redhat.com:443,s3.amazonaws.com:443"},
 				ClusterId:      testClusterId,
+				SkipLinkCheck:  true,
 			},
 		},
 	}

cmd/servicelog/post.go

@@ -45,7 +45,7 @@ type PostCmdOptions struct {
 	clustersFile    string
 	InternalOnly    bool
 	ClusterId       string
-	skipLinkCheck   bool
+	SkipLinkCheck   bool
 
 	// Messaged clusters
 	successfulClusters map[string]string
@@ -96,7 +96,7 @@ func newPostCmd() *cobra.Command {
 	postCmd.Flags().StringArrayVarP(&opts.filterFiles, "query-file", "f", []string{}, "File containing search queries to apply. All lines in the file will be concatenated into a single query. If this flag is called multiple times, every file's search query will be combined with logical AND.")
 	postCmd.Flags().StringVarP(&opts.clustersFile, "clusters-file", "c", "", `Read a list of clusters to post the servicelog to. the format of the file is: {"clusters":["$CLUSTERID"]}`)
 	postCmd.Flags().BoolVarP(&opts.InternalOnly, "internal", "i", false, "Internal only service log. Use MESSAGE for template parameter (eg. -p MESSAGE='My super secret message').")
-	postCmd.Flags().BoolVar(&opts.skipLinkCheck, "skip-link-check", false, "Skip validating if links in Service Log are valid")
+	postCmd.Flags().BoolVar(&opts.SkipLinkCheck, "skip-link-check", false, "Skip validating if links in Service Log are valid")
 
 	return postCmd
 }
@@ -245,7 +245,7 @@ func (o *PostCmdOptions) Run() error {
 	}
 
 	// Validate links in service log unless skipped via '--skip-link-check'
-	if !o.skipLinkCheck {
+	if !o.SkipLinkCheck {
 		lv := link_validator.NewLinkValidator()
 		messageText := o.Message.Summary + " " + o.Message.Description
 		warnings, err := lv.ValidateLinks(messageText)