aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/swarm
diff options
context:
space:
mode:
authorAnton Evangelatov <anton.evangelatov@gmail.com>2018-11-19 21:58:10 +0800
committerGitHub <noreply@github.com>2018-11-19 21:58:10 +0800
commitd31f1f4fdb905acb3d7c766683e584bb17f8df0d (patch)
tree782a4fc7c211ac304800a7ced68a5abf86c61efd /cmd/swarm
parent6b6c4d1c2754f8dd70172ab58d7ee33cf9058c7d (diff)
downloadgo-tangerine-d31f1f4fdb905acb3d7c766683e584bb17f8df0d.tar
go-tangerine-d31f1f4fdb905acb3d7c766683e584bb17f8df0d.tar.gz
go-tangerine-d31f1f4fdb905acb3d7c766683e584bb17f8df0d.tar.bz2
go-tangerine-d31f1f4fdb905acb3d7c766683e584bb17f8df0d.tar.lz
go-tangerine-d31f1f4fdb905acb3d7c766683e584bb17f8df0d.tar.xz
go-tangerine-d31f1f4fdb905acb3d7c766683e584bb17f8df0d.tar.zst
go-tangerine-d31f1f4fdb905acb3d7c766683e584bb17f8df0d.zip
cmd/swarm/swarm-smoke: update smoke tests to fit the new scheme for the k8s cluster (#18104)
Diffstat (limited to 'cmd/swarm')
-rw-r--r--cmd/swarm/swarm-smoke/main.go4
-rw-r--r--cmd/swarm/swarm-smoke/upload_and_sync.go23
2 files changed, 15 insertions, 12 deletions
diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go
index 97054dd47..4ff17fd5b 100644
--- a/cmd/swarm/swarm-smoke/main.go
+++ b/cmd/swarm/swarm-smoke/main.go
@@ -45,8 +45,8 @@ func main() {
app.Flags = []cli.Flag{
cli.StringFlag{
Name: "cluster-endpoint",
- Value: "testing",
- Usage: "cluster to point to (local, open or testing)",
+ Value: "prod",
+ Usage: "cluster to point to (prod or a given namespace)",
Destination: &cluster,
},
cli.IntFlag{
diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go
index 358141c7c..7872421d3 100644
--- a/cmd/swarm/swarm-smoke/upload_and_sync.go
+++ b/cmd/swarm/swarm-smoke/upload_and_sync.go
@@ -20,6 +20,7 @@ import (
"bytes"
"crypto/md5"
crand "crypto/rand"
+ "crypto/tls"
"errors"
"fmt"
"io"
@@ -32,6 +33,7 @@ import (
"time"
"github.com/ethereum/go-ethereum/log"
+ colorable "github.com/mattn/go-colorable"
"github.com/pborman/uuid"
cli "gopkg.in/urfave/cli.v1"
@@ -39,18 +41,13 @@ import (
func generateEndpoints(scheme string, cluster string, from int, to int) {
if cluster == "prod" {
- cluster = ""
- } else if cluster == "local" {
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 {
- cluster = cluster + "."
- }
-
- for port := from; port <= to; port++ {
- endpoints = append(endpoints, fmt.Sprintf("%s://%v.%sswarm-gateways.net", scheme, port, cluster))
+ for port := from; port <= to; port++ {
+ endpoints = append(endpoints, fmt.Sprintf("%s://swarm-%v-%s.stg.swarm-gateways.net", scheme, port, cluster))
+ }
}
if includeLocalhost {
@@ -59,6 +56,9 @@ func generateEndpoints(scheme string, cluster string, from int, to int) {
}
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())
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)
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 {
log.Warn(err.Error(), "ruid", ruid)
return err