Skip to content

Commit

Permalink
PMM-13054 minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Jul 11, 2024
1 parent 99ef848 commit 949a12a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/managed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
- name: Launch PMM Server (see docker-compose.yml)
run: |
make env-compose-up # the container workdir is /root/go/src/github.com/percona/pmm
docker exec -t pmm-server id -Z || :
docker logs pmm-server
- name: Mark the root directory of pmm as safe
Expand Down Expand Up @@ -120,7 +121,7 @@ jobs:
docker exec pmm-server go env | sort
docker exec pmm-server supervisorctl status || true
services=$(docker exec pmm-server supervisorctl status | awk '{print $1}')
while IFS= read -r service; do
for service in "$services[@]"; do
echo "Logs for $service:"
docker exec pmm-server supervisorctl tail $service
done <<< "$services"
done
2 changes: 0 additions & 2 deletions api-tests/server/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,8 @@ func TestServiceAccountPermissions(t *testing.T) {
}

for _, test := range tests {
test := test
t.Run(test.name, func(t *testing.T) {
for _, user := range test.userCase {
user := user
t.Run(fmt.Sprintf("Service Token auth %s", user.userType), func(t *testing.T) {
// make a BaseURL without authentication
u, err := url.Parse(pmmapitests.BaseURL.String())
Expand Down
8 changes: 2 additions & 6 deletions managed/services/grafana/auth_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,8 @@ var rules = map[string]role{
"/v1/server/updates:start": admin,
"/v1/server/updates:getStatus": none, // special token-based auth
"/v1/server/settings": admin,
"/v1/platform:connect": admin,
"/v1/platform:disconnect": admin,
"/v1/platform/organization/": viewer,
"/v1/platform/contact": viewer,
"/v1/platform/server": viewer,
"/v1/platform/user": viewer,
"/v1/platform:": admin,
"/v1/platform/": viewer,
"/v1/users": viewer,

// must be available without authentication for health checking
Expand Down

0 comments on commit 949a12a

Please sign in to comment.