cmd/swarm/swarm-smoke: update smoke tests to fit the new scheme for the k8s cluster (#18104)
This commit is contained in:
		
							parent
							
								
									6b6c4d1c27
								
							
						
					
					
						commit
						d31f1f4fdb
					
				| @ -45,8 +45,8 @@ func main() { | |||||||
| 	app.Flags = []cli.Flag{ | 	app.Flags = []cli.Flag{ | ||||||
| 		cli.StringFlag{ | 		cli.StringFlag{ | ||||||
| 			Name:        "cluster-endpoint", | 			Name:        "cluster-endpoint", | ||||||
| 			Value:       "testing", | 			Value:       "prod", | ||||||
| 			Usage:       "cluster to point to (local, open or testing)", | 			Usage:       "cluster to point to (prod or a given namespace)", | ||||||
| 			Destination: &cluster, | 			Destination: &cluster, | ||||||
| 		}, | 		}, | ||||||
| 		cli.IntFlag{ | 		cli.IntFlag{ | ||||||
|  | |||||||
| @ -20,6 +20,7 @@ import ( | |||||||
| 	"bytes" | 	"bytes" | ||||||
| 	"crypto/md5" | 	"crypto/md5" | ||||||
| 	crand "crypto/rand" | 	crand "crypto/rand" | ||||||
|  | 	"crypto/tls" | ||||||
| 	"errors" | 	"errors" | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	"io" | 	"io" | ||||||
| @ -32,6 +33,7 @@ import ( | |||||||
| 	"time" | 	"time" | ||||||
| 
 | 
 | ||||||
| 	"github.com/ethereum/go-ethereum/log" | 	"github.com/ethereum/go-ethereum/log" | ||||||
|  | 	colorable "github.com/mattn/go-colorable" | ||||||
| 	"github.com/pborman/uuid" | 	"github.com/pborman/uuid" | ||||||
| 
 | 
 | ||||||
| 	cli "gopkg.in/urfave/cli.v1" | 	cli "gopkg.in/urfave/cli.v1" | ||||||
| @ -39,18 +41,13 @@ import ( | |||||||
| 
 | 
 | ||||||
| func generateEndpoints(scheme string, cluster string, from int, to int) { | func generateEndpoints(scheme string, cluster string, from int, to int) { | ||||||
| 	if cluster == "prod" { | 	if cluster == "prod" { | ||||||
| 		cluster = "" |  | ||||||
| 	} else if cluster == "local" { |  | ||||||
| 		for port := from; port <= to; port++ { | 		for port := from; port <= to; port++ { | ||||||
| 			endpoints = append(endpoints, fmt.Sprintf("%s://localhost:%v", scheme, port)) | 			endpoints = append(endpoints, fmt.Sprintf("%s://%v.swarm-gateways.net", scheme, port)) | ||||||
| 		} | 		} | ||||||
| 		return |  | ||||||
| 	} else { | 	} else { | ||||||
| 		cluster = cluster + "." | 		for port := from; port <= to; port++ { | ||||||
| 	} | 			endpoints = append(endpoints, fmt.Sprintf("%s://swarm-%v-%s.stg.swarm-gateways.net", scheme, port, cluster)) | ||||||
| 
 | 		} | ||||||
| 	for port := from; port <= to; port++ { |  | ||||||
| 		endpoints = append(endpoints, fmt.Sprintf("%s://%v.%sswarm-gateways.net", scheme, port, cluster)) |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if includeLocalhost { | 	if includeLocalhost { | ||||||
| @ -59,6 +56,9 @@ func generateEndpoints(scheme string, cluster string, from int, to int) { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func cliUploadAndSync(c *cli.Context) error { | func cliUploadAndSync(c *cli.Context) error { | ||||||
|  | 	log.PrintOrigins(true) | ||||||
|  | 	log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true)))) | ||||||
|  | 
 | ||||||
| 	defer func(now time.Time) { log.Info("total time", "time", time.Since(now), "size (kb)", filesize) }(time.Now()) | 	defer func(now time.Time) { log.Info("total time", "time", time.Since(now), "size (kb)", filesize) }(time.Now()) | ||||||
| 
 | 
 | ||||||
| 	generateEndpoints(scheme, cluster, from, to) | 	generateEndpoints(scheme, cluster, from, to) | ||||||
| @ -112,7 +112,10 @@ func fetch(hash string, endpoint string, original []byte, ruid string) error { | |||||||
| 	time.Sleep(3 * time.Second) | 	time.Sleep(3 * time.Second) | ||||||
| 
 | 
 | ||||||
| 	log.Trace("http get request", "ruid", ruid, "api", endpoint, "hash", hash) | 	log.Trace("http get request", "ruid", ruid, "api", endpoint, "hash", hash) | ||||||
| 	res, err := http.Get(endpoint + "/bzz:/" + hash + "/") | 	client := &http.Client{Transport: &http.Transport{ | ||||||
|  | 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, | ||||||
|  | 	}} | ||||||
|  | 	res, err := client.Get(endpoint + "/bzz:/" + hash + "/") | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Warn(err.Error(), "ruid", ruid) | 		log.Warn(err.Error(), "ruid", ruid) | ||||||
| 		return err | 		return err | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user