diff --git a/go.mod b/go.mod index a1d2bea..9c8ca32 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/colonyos/pollinator go 1.19 require ( - github.com/colonyos/colonies v1.6.4 + github.com/colonyos/colonies v1.7.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.7.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 899a485..6094008 100644 --- a/go.sum +++ b/go.sum @@ -88,8 +88,8 @@ github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcK github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/colonyos/colonies v1.6.4 h1:doNJhQN9qZ1GtkTvo+wbwdTAbOId3tHVueDe4fs6Pl8= -github.com/colonyos/colonies v1.6.4/go.mod h1:k7JPPP/xcCbCBe/dfOuthgfDN9/DIPY5mvuo0ZFVrG8= +github.com/colonyos/colonies v1.7.0 h1:imlCkmM84GdFpDN8INRQBIMhyT/GyidMUKWDP4xfT6g= +github.com/colonyos/colonies v1.7.0/go.mod h1:k7JPPP/xcCbCBe/dfOuthgfDN9/DIPY5mvuo0ZFVrG8= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= diff --git a/internal/cli/common.go b/internal/cli/common.go index 0f116b5..724fa57 100644 --- a/internal/cli/common.go +++ b/internal/cli/common.go @@ -6,7 +6,6 @@ import ( "os" "strconv" - "github.com/colonyos/colonies/pkg/security" "github.com/colonyos/pollinator/pkg/build" log "github.com/sirupsen/logrus" ) @@ -62,29 +61,18 @@ func parseEnv() { Verbose = false } - if ColonyID == "" { - ColonyID = os.Getenv("COLONIES_COLONY_ID") + if ColonyName == "" { + ColonyName = os.Getenv("COLONIES_COLONY_NAME") } - if ColonyID == "" { - CheckError(errors.New("Unknown Colony Id")) + if ColonyName == "" { + CheckError(errors.New("Unknown Colony name")) } - if ExecutorID == "" { - ExecutorID = os.Getenv("COLONIES_EXECUTOR_ID") + if PrvKey == "" { + PrvKey = os.Getenv("COLONIES_PRVKEY") } - if ExecutorID == "" { - CheckError(errors.New("Unknown Executor Id")) - } - - keychain, err := security.CreateKeychain(KEYCHAIN_PATH) - CheckError(err) - - if ExecutorPrvKey == "" { - ExecutorPrvKey = os.Getenv("COLONIES_EXECUTOR_PRVKEY") - } - if ExecutorPrvKey == "" { - ExecutorPrvKey, err = keychain.GetPrvKey(ExecutorID) - CheckError(err) + if PrvKey == "" { + CheckError(errors.New("Unkown private key")) } DashboardURL = os.Getenv("COLONYOS_DASHBOARD_URL") diff --git a/internal/cli/root.go b/internal/cli/root.go index a68b004..ab300d2 100644 --- a/internal/cli/root.go +++ b/internal/cli/root.go @@ -16,9 +16,8 @@ var ColoniesServerPort int var ColoniesInsecure bool var ColoniesSkipTLSVerify bool var ColoniesUseTLS bool -var ColonyID string -var ExecutorID string -var ExecutorPrvKey string +var ColonyName string +var PrvKey string var ExecutorType string var Follow bool var Count int diff --git a/internal/cli/run.go b/internal/cli/run.go index 86f6969..3f37e3d 100644 --- a/internal/cli/run.go +++ b/internal/cli/run.go @@ -40,19 +40,19 @@ var runCmd = &cobra.Command{ client := client.CreateColoniesClient(ColoniesServerHost, ColoniesServerPort, ColoniesInsecure, ColoniesSkipTLSVerify) // Sync all directories - err = colonies.SyncDir("/src", client, ColonyID, ExecutorPrvKey, proj, true) + err = colonies.SyncDir("/src", client, ColonyName, PrvKey, proj, true) CheckError(err) - err = colonies.SyncDir("/data", client, ColonyID, ExecutorPrvKey, proj, true) + err = colonies.SyncDir("/data", client, ColonyName, PrvKey, proj, true) CheckError(err) - snapshotID, err := colonies.CreateSrcSnapshot(client, ColonyID, ExecutorPrvKey, proj) + snapshotID, err := colonies.CreateSrcSnapshot(client, ColonyName, PrvKey, proj) CheckError(err) log.Debug("Generating function spec") - funcSpec := colonies.CreateFuncSpec(ColonyID, proj, snapshotID) + funcSpec := colonies.CreateFuncSpec(ColonyName, proj, snapshotID) CheckError(err) - addedProcess, err := client.Submit(funcSpec, ExecutorPrvKey) + addedProcess, err := client.Submit(funcSpec, PrvKey) CheckError(err) url := DashboardURL + "/process?processid=" + addedProcess.ID @@ -62,9 +62,9 @@ var runCmd = &cobra.Command{ log.Info("Follow process at " + link) if Follow { - err = colonies.Follow(client, addedProcess, ExecutorPrvKey, Count) + err = colonies.Follow(client, addedProcess, PrvKey, Count) CheckError(err) - err = colonies.SyncDir("/result", client, ColonyID, ExecutorPrvKey, proj, false) + err = colonies.SyncDir("/result", client, ColonyName, PrvKey, proj, false) CheckError(err) } }, diff --git a/pkg/colonies/colonies.go b/pkg/colonies/colonies.go index 2f090c5..bceaaa7 100644 --- a/pkg/colonies/colonies.go +++ b/pkg/colonies/colonies.go @@ -11,8 +11,8 @@ import ( log "github.com/sirupsen/logrus" ) -func SyncDir(dir string, client *client.ColoniesClient, colonyID string, executorPrvKey string, proj *project.Project, keepLocal bool) error { - fsClient, err := fs.CreateFSClient(client, colonyID, executorPrvKey) +func SyncDir(dir string, client *client.ColoniesClient, colonyName string, executorPrvKey string, proj *project.Project, keepLocal bool) error { + fsClient, err := fs.CreateFSClient(client, colonyName, executorPrvKey) if err != nil { return err } @@ -36,7 +36,7 @@ func SyncDir(dir string, client *client.ColoniesClient, colonyID string, executo } for _, syncPlan := range syncPlans { - err = fsClient.ApplySyncPlan(colonyID, syncPlan) + err = fsClient.ApplySyncPlan(colonyName, syncPlan) if err != nil { return err } @@ -45,9 +45,9 @@ func SyncDir(dir string, client *client.ColoniesClient, colonyID string, executo return nil } -func CreateSrcSnapshot(client *client.ColoniesClient, colonyID string, executorPrvKey string, proj *project.Project) (string, error) { +func CreateSrcSnapshot(client *client.ColoniesClient, colonyName string, executorPrvKey string, proj *project.Project) (string, error) { snapshotID := core.GenerateRandomID() - snapshot, err := client.CreateSnapshot(colonyID, "/pollinator/"+proj.ProjectID+"/src", snapshotID, executorPrvKey) + snapshot, err := client.CreateSnapshot(colonyName, "/pollinator/"+proj.ProjectID+"/src", snapshotID, executorPrvKey) if err != nil { return "", err } @@ -56,7 +56,7 @@ func CreateSrcSnapshot(client *client.ColoniesClient, colonyID string, executorP return snapshot.ID, nil } -func CreateFuncSpec(colonyID string, project *project.Project, snapshotID string) *core.FunctionSpec { +func CreateFuncSpec(colonyName string, project *project.Project, snapshotID string) *core.FunctionSpec { maxRetries := 3 env := make(map[string]string) env["PROJECT_DIR"] = "/cfs/" + project.ProjectID @@ -106,7 +106,7 @@ func CreateFuncSpec(colonyID string, project *project.Project, snapshotID string "execute", args, kwargs, - colonyID, + colonyName, []string{}, project.Conditions.ExecutorType, maxWaitTime,