Skip to content

Commit

Permalink
[SPVR-81] eru-cli to support files with user-specific permission and …
Browse files Browse the repository at this point in the history
…ownership (#74)

* [SPVR-81][Function] eru-cli to support files with user-specific permission and ownership

* format

* lambda support file files with user-specific permission and ownership
  • Loading branch information
DuodenumL authored Sep 30, 2021
1 parent bacf570 commit 571fcf4
Show file tree
Hide file tree
Showing 58 changed files with 184 additions and 57 deletions.
1 change: 1 addition & 0 deletions cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/projecteru2/cli/cmd/workload"
"github.com/projecteru2/cli/describe"
"github.com/projecteru2/cli/version"

"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
1 change: 1 addition & 0 deletions cmd/core/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package core

import (
"github.com/projecteru2/cli/cmd/utils"

"github.com/urfave/cli/v2"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/core/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/image/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"io/ioutil"
"strings"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
dockerengine "github.com/projecteru2/core/engine/docker"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sethgrid/curse"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
Expand Down
3 changes: 2 additions & 1 deletion cmd/image/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"io"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
1 change: 1 addition & 0 deletions cmd/image/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package image

import (
"github.com/projecteru2/cli/cmd/utils"

"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/image/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"io"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
1 change: 1 addition & 0 deletions cmd/lambda/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package lambda
import (
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/core/strategy"

"github.com/urfave/cli/v2"
)

Expand Down
9 changes: 7 additions & 2 deletions cmd/lambda/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"fmt"
"strings"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/interactive"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down Expand Up @@ -91,6 +92,8 @@ func generateLambdaOptions(c *cli.Context) (*corepb.RunAndWaitOptions, error) {
return nil, fmt.Errorf("[Lambda] memory wrong %v", err)
}

content, modes, owners := utils.GenerateFileOptions(c)

return &corepb.RunAndWaitOptions{
Async: c.Bool("async"),
AsyncTimeout: int32(c.Int("async-timeout")),
Expand Down Expand Up @@ -122,7 +125,9 @@ func generateLambdaOptions(c *cli.Context) (*corepb.RunAndWaitOptions, error) {
Networks: utils.GetNetworks(network),
OpenStdin: c.Bool("stdin"),
DeployStrategy: corepb.DeployOptions_Strategy(corepb.DeployOptions_Strategy_value[strings.ToUpper(c.String("deploy-strategy"))]),
Data: utils.ReadAllFiles(c.StringSlice("file")),
Data: content,
Owners: owners,
Modes: modes,
User: c.String("user"),
},
}, nil
Expand Down
1 change: 1 addition & 0 deletions cmd/network/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package network

import (
"github.com/projecteru2/cli/cmd/utils"

"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/network/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package network
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/network/disconnect.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package network
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
1 change: 1 addition & 0 deletions cmd/node/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/urfave/cli/v2"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/node/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package node

import (
"github.com/projecteru2/cli/cmd/utils"

"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/node/down.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"time"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/node/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package node
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/node/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package node
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/node/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package node
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/node/set.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
"strconv"
"strings"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/node/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"time"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/node/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package node
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/node/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package node
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
1 change: 1 addition & 0 deletions cmd/node/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/node/workloads.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package node
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/pod/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package pod
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
5 changes: 3 additions & 2 deletions cmd/pod/capacity.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"context"
"fmt"

"github.com/google/uuid"
"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/google/uuid"
"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/pod/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package pod

import (
"github.com/projecteru2/cli/cmd/utils"

"github.com/urfave/cli/v2"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/pod/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/pod/networks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package pod
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/pod/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"context"
"strings"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/pod/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package pod
import (
"context"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/pod/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import (
"strconv"
"strings"

"github.com/juju/errors"
"github.com/projecteru2/cli/cmd/utils"
"github.com/projecteru2/cli/describe"
corepb "github.com/projecteru2/core/rpc/gen"

"github.com/juju/errors"
"github.com/urfave/cli/v2"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/status/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package status

import (
"github.com/projecteru2/cli/cmd/utils"

"github.com/urfave/cli/v2"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/status/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/projecteru2/cli/cmd/utils"
corepb "github.com/projecteru2/core/rpc/gen"
coreutils "github.com/projecteru2/core/utils"

"github.com/sethvargo/go-signalcontext"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
Expand Down
1 change: 1 addition & 0 deletions cmd/utils/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
coreclient "github.com/projecteru2/core/client"
corepb "github.com/projecteru2/core/rpc/gen"
coretypes "github.com/projecteru2/core/types"

"github.com/urfave/cli/v2"
)

Expand Down
Loading

0 comments on commit 571fcf4

Please sign in to comment.