Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mongo #5

Merged
merged 6 commits into from
Jul 1, 2020
Merged

Mongo #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0462c68
mongodb as policy store
dingwenfang Jun 27, 2020
c76256a
Merge branch 'master' of https://github.com/teramoby/speedle-plus int…
dingwenfang Jun 28, 2020
08dc1f7
use mongodb cloud instance for testing
dingwenfang Jun 30, 2020
10227ae
Update ci.yml
dingwenfang Jul 1, 2020
583ca10
recolve review comments
dingwenfang Jul 1, 2020
16f345b
Merge branch 'mongo' of https://github.com/dingwenfang/speedle-plus i…
dingwenfang Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ jobs:
runs-on: ubuntu-latest
name: build-test
steps:
# resolve https://github.com/actions/virtual-environments/issues/798
- name: bypass ubuntu DNS issue
run: |
sudo ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
- uses: actions/checkout@v2
name: Checkout code
with:
Expand Down
135 changes: 132 additions & 3 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@ ignored = ["github.com/teramoby/speedle-plus/samples*"]
[[override]]
name = "github.com/coreos/bbolt"
revision = "48ea1b39c25fc1bab3506fbc712ecbaa842c4d2d"

[[constraint]]
name = "go.mongodb.org/mongo-driver"
version = "1.3.4"
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,39 @@ speedleUnitTests:
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/eval
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/store/file
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/store/etcd
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/store/mongodb
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/cmd/spctl/pdl
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/suid
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/assertion
go clean -testcache
STORE_TYPE=etcd go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/eval
go clean -testcache
STORE_TYPE=mongodb go test ${TEST_OPTS} github.com/teramoby/speedle-plus/pkg/eval

testSpeedleRest:
pkg/svcs/pmsrest/run_file_test.sh
pkg/svcs/pmsrest/run_etcd_test.sh
pkg/svcs/pmsrest/run_mongodb_test.sh

testSpeedleGRpc:
pkg/svcs/pmsgrpc/run_file_test.sh
pkg/svcs/pmsgrpc/run_etcd_test.sh
pkg/svcs/pmsgrpc/run_mongodb_test.sh

testSpeedleRestADSCheck:
pkg/svcs/adsrest/run_file_test.sh
pkg/svcs/adsrest/run_etcd_test.sh
pkg/svcs/adsrest/run_mongodb_test.sh

testSpeedleGRpcADSCheck:
pkg/svcs/adsgrpc/run_file_test.sh
pkg/svcs/adsgrpc/run_etcd_test.sh
pkg/svcs/adsgrpc/run_mongodb_test.sh

testSpctl:
cmd/spctl/command/run_file_test.sh
cmd/spctl/command/run_etcd_test.sh
cmd/spctl/command/run_mongodb_test.sh

testSpeedleTls:
pkg/svcs/pmsrest/tls_test.sh
Expand Down
58 changes: 29 additions & 29 deletions api/pms/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ type Permission struct {
}

type Function struct {
Name string `json:"name"`
Description string `json:"description,omitempty"`
FuncURL string `json:"funcURL"` //used by speedle/sphinx ADS
LocalFuncURL string `json:"localFuncURL,omitempty"` //used by sphinx runtime proxy to get better performance
CA string `json:"ca,omitempty"` //security related configurations
ResultCachable bool `json:"resultCachable,omitempty"` //false by default
ResultTTL int64 `json:"resultTTL,omitempty"` // TTL of function result in second
Metadata map[string]string `json:"metadata,omitempty"`
Name string `json:"name" bson:"_id"`
Description string `json:"description,omitempty" bson:"description,omitempty"`
FuncURL string `json:"funcURL" bson:"funcurl"` //used by speedle/sphinx ADS
LocalFuncURL string `json:"localFuncURL,omitempty" bson:"localfuncurl"` //used by sphinx runtime proxy to get better performance
CA string `json:"ca,omitempty" bson:"ca,omitempty"` //security related configurations
ResultCachable bool `json:"resultCachable,omitempty" bson:"resultcachable,omitempty"` //false by default
ResultTTL int64 `json:"resultTTL,omitempty" bson:"resultttl,omitempty"` // TTL of function result in second
Metadata map[string]string `json:"metadata,omitempty" bson:"metadata,omitempty"`
}

type Policy struct {
ID string `json:"id"`
Name string `json:"name"`
Effect string `json:"effect,omitempty"`
Permissions []*Permission `json:"permissions,omitempty"`
Principals [][]string `json:"principals,omitempty"`
Condition string `json:"condition,omitempty"`
Metadata map[string]string `json:"metadata,omitempty"`
ID string `json:"id" bson:"_id"`
Name string `json:"name" bson:"name,omitempty"`
Effect string `json:"effect,omitempty" bson:"effect,omitempty"`
Permissions []*Permission `json:"permissions,omitempty" bson:"permissions,omitempty"`
Principals [][]string `json:"principals,omitempty" bson:"principals,omitempty"`
Condition string `json:"condition,omitempty" bson:"condition,omitempty"`
Metadata map[string]string `json:"metadata,omitempty" bson:"metadata,omitempty"`
}

const (
Expand All @@ -41,23 +41,23 @@ const (
)

type RolePolicy struct {
ID string `json:"id"`
Name string `json:"name"`
Effect string `json:"effect,omitempty"`
Roles []string `json:"roles,omitempty"`
Principals []string `json:"principals,omitempty"`
Resources []string `json:"resources,omitempty"`
ResourceExpressions []string `json:"resourceExpressions,omitempty"`
Condition string `json:"condition,omitempty"`
Metadata map[string]string `json:"metadata,omitempty"`
ID string `json:"id" bson:"_id"`
Name string `json:"name" bson:"name,omitempty"`
Effect string `json:"effect,omitempty" bson:"effect,omitempty"`
Roles []string `json:"roles,omitempty" bson:"roles,omitempty"`
Principals []string `json:"principals,omitempty" bson:"principals,omitempty"`
Resources []string `json:"resources,omitempty" bson:"resources,omitempty"`
ResourceExpressions []string `json:"resourceExpressions,omitempty" bson:"resourceexpressions,omitempty"`
Condition string `json:"condition,omitempty" bson:"condition,omitempty"`
Metadata map[string]string `json:"metadata,omitempty" bson:"metadata,omitempty"`
}

type Service struct {
Name string `json:"name" binding:"required"`
Type string `json:"type,omitempty"`
Policies []*Policy `json:"policies,omitempty"`
RolePolicies []*RolePolicy `json:"rolePolicies,omitempty"`
Metadata map[string]string `json:"metadata,omitempty"`
Name string `json:"name" binding:"required" bson:"_id"`
Type string `json:"type,omitempty" bson:"type,omitempty"`
Policies []*Policy `json:"policies,omitempty" bson:"policies,omitempty"`
RolePolicies []*RolePolicy `json:"rolePolicies,omitempty" bson:"rolepolicies,omitempty"`
Metadata map[string]string `json:"metadata,omitempty" bson:"metadata,omitempty"`
}

const GlobalService = "global"
Expand Down
13 changes: 13 additions & 0 deletions cmd/spctl/command/run_mongodb_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -ex
source ${GOPATH}/src/github.com/teramoby/speedle-plus/setTestEnv.sh
go clean -testcache

#Reconfig spctl
${GOPATH}/bin/spctl config pms-endpoint http://localhost:6733/policy-mgmt/v1/

startPMS mongodb --config-file ${GOPATH}/src/github.com/teramoby/speedle-plus/pkg/svcs/pmsrest/config_mongodb.json
sleep 5
${GOPATH}/bin/spctl delete service --all
go test ${TEST_OPTS} github.com/teramoby/speedle-plus/cmd/spctl/command -run=TestMats

1 change: 1 addition & 0 deletions cmd/speedle-ads/stores.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ package main
import (
_ "github.com/teramoby/speedle-plus/pkg/store/etcd"
_ "github.com/teramoby/speedle-plus/pkg/store/file"
_ "github.com/teramoby/speedle-plus/pkg/store/mongodb"
)
1 change: 1 addition & 0 deletions cmd/speedle-pms/stores.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ package main
import (
_ "github.com/teramoby/speedle-plus/pkg/store/etcd"
_ "github.com/teramoby/speedle-plus/pkg/store/file"
_ "github.com/teramoby/speedle-plus/pkg/store/mongodb"
)
Loading