public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: make fmt 

Signed-off-by: Benjamin Ritter <benjamin.ritter@x-cellent.com>
This commit is contained in:
Benjamin Ritter 2026-08-03 11:52:21 +02:00 committed by Benjamin Ritter
parent dcbe0225cb
commit 5c0c826751
3 changed files with 246 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/filesystems/ext234.go
View File

@ -17,7 +17,7 @@ const (
resize2fs = "resize2fs" resize2fs = "resize2fs"
) )
//Ext234Resize implements the FilesystemResizer interface for the ext4/3/2fs. // Ext234Resize implements the FilesystemResizer interface for the ext4/3/2fs.
type Ext234Resize struct { type Ext234Resize struct {
} }

486
pkg/util/teams/teams_test.go
View File

@ -1,243 +1,243 @@
package teams package teams
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"reflect" "reflect"
"testing" "testing"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
var ( var (
logger = logrus.New().WithField("pkg", "teamsapi") logger = logrus.New().WithField("pkg", "teamsapi")
token = "ec45b1cfbe7100c6315d183a3eb6cec0M2U1LWJkMzEtZDgzNzNmZGQyNGM3IiwiYXV0aF90aW1lIjoxNDkzNzMwNzQ1LCJpc3MiOiJodHRwcz" token = "ec45b1cfbe7100c6315d183a3eb6cec0M2U1LWJkMzEtZDgzNzNmZGQyNGM3IiwiYXV0aF90aW1lIjoxNDkzNzMwNzQ1LCJpc3MiOiJodHRwcz"
input = `{ input = `{
"dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", "dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net",
"id": "acid", "id": "acid",
"id_name": "acid", "id_name": "acid",
"team_id": "111222", "team_id": "111222",
"type": "official", "type": "official",
"name": "Acid team name", "name": "Acid team name",
"mail": [ "mail": [
"email1@example.com", "email1@example.com",
"email2@example.com" "email2@example.com"
], ],
"alias": [ "alias": [
"acid" "acid"
], ],
"member": [ "member": [
"member1", "member1",
"member2", "member2",
"member3" "member3"
], ],
"infrastructure-accounts": [ "infrastructure-accounts": [
{ {
"id": "1234512345", "id": "1234512345",
"name": "acid", "name": "acid",
"provider": "aws", "provider": "aws",
"type": "aws", "type": "aws",
"description": "", "description": "",
"owner": "acid", "owner": "acid",
"owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", "owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net",
"disabled": false "disabled": false
}, },
{ {
"id": "5432154321", "id": "5432154321",
"name": "db", "name": "db",
"provider": "aws", "provider": "aws",
"type": "aws", "type": "aws",
"description": "", "description": "",
"owner": "acid", "owner": "acid",
"owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", "owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net",
"disabled": false "disabled": false
} }
], ],
"cost_center": "00099999", "cost_center": "00099999",
"delivery_lead": "member4", "delivery_lead": "member4",
"parent_team_id": "111221" "parent_team_id": "111221"
}` }`
) )
var teamsAPItc = []struct { var teamsAPItc = []struct {
in string in string
inCode int inCode int
inTeam string inTeam string
out *Team out *Team
err error err error
}{ }{
{ {
input, input,
200, 200,
"acid", "acid",
&Team{ &Team{
Dn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", Dn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net",
ID: "acid", ID: "acid",
TeamName: "acid", TeamName: "acid",
TeamID: "111222", TeamID: "111222",
Type: "official", Type: "official",
FullName: "Acid team name", FullName: "Acid team name",
Aliases: []string{"acid"}, Aliases: []string{"acid"},
Mails: []string{"email1@example.com", "email2@example.com"}, Mails: []string{"email1@example.com", "email2@example.com"},
Members: []string{"member1", "member2", "member3"}, Members: []string{"member1", "member2", "member3"},
CostCenter: "00099999", CostCenter: "00099999",
DeliveryLead: "member4", DeliveryLead: "member4",
ParentTeamID: "111221", ParentTeamID: "111221",
InfrastructureAccounts: []infrastructureAccount{ InfrastructureAccounts: []infrastructureAccount{
{ {
ID: "1234512345", ID: "1234512345",
Name: "acid", Name: "acid",
Provider: "aws", Provider: "aws",
Type: "aws", Type: "aws",
Description: "", Description: "",
Owner: "acid", Owner: "acid",
OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net",
Disabled: false}, Disabled: false},
{ {
ID: "5432154321", ID: "5432154321",
Name: "db", Name: "db",
Provider: "aws", Provider: "aws",
Type: "aws", Type: "aws",
Description: "", Description: "",
Owner: "acid", Owner: "acid",
OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net",
Disabled: false}, Disabled: false},
}, },
}, },
nil}, { nil}, {
`{"error": "Access Token not valid"}`, `{"error": "Access Token not valid"}`,
401, 401,
"acid", "acid",
nil, nil,
fmt.Errorf(`team API query failed with status code 401 and message: '"Access Token not valid"'`), fmt.Errorf(`team API query failed with status code 401 and message: '"Access Token not valid"'`),
}, },
{ {
`{"status": "I'm a teapot'"}`, `{"status": "I'm a teapot'"}`,
418, 418,
"acid", "acid",
nil, nil,
fmt.Errorf(`team API query failed with status code 418`), fmt.Errorf(`team API query failed with status code 418`),
}, },
{ {
`{"status": "I'm a teapot`, `{"status": "I'm a teapot`,
418, 418,
"acid", "acid",
nil, nil,
fmt.Errorf(`team API query failed with status code 418 and malformed response: unexpected EOF`), fmt.Errorf(`team API query failed with status code 418 and malformed response: unexpected EOF`),
}, },
{ {
`{"status": "I'm a teapot`, `{"status": "I'm a teapot`,
200, 200,
"acid", "acid",
nil, nil,
fmt.Errorf(`could not parse team API response: unexpected EOF`), fmt.Errorf(`could not parse team API response: unexpected EOF`),
}, },
{ {
input, input,
404, 404,
"banana", "banana",
nil, nil,
fmt.Errorf(`team API query failed with status code 404`), fmt.Errorf(`team API query failed with status code 404`),
}, },
} }
var requestsURLtc = []struct { var requestsURLtc = []struct {
url string url string
err error err error
}{ }{
{ {
"coffee://localhost/", "coffee://localhost/",
fmt.Errorf(`Get "coffee://localhost/teams/acid": unsupported protocol scheme "coffee"`), fmt.Errorf(`Get "coffee://localhost/teams/acid": unsupported protocol scheme "coffee"`),
}, },
{ {
"http://192.168.0.%31/", "http://192.168.0.%31/",
fmt.Errorf(`parse "http://192.168.0.%%31/teams/acid": invalid URL escape "%%31"`), fmt.Errorf(`parse "http://192.168.0.%%31/teams/acid": invalid URL escape "%%31"`),
}, },
} }
func TestInfo(t *testing.T) { func TestInfo(t *testing.T) {
for _, tc := range teamsAPItc { for _, tc := range teamsAPItc {
func() { func() {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("Authorization") != "Bearer "+token { if r.Header.Get("Authorization") != "Bearer "+token {
t.Errorf("authorization token is wrong or not provided") t.Errorf("authorization token is wrong or not provided")
} }
w.WriteHeader(tc.inCode) w.WriteHeader(tc.inCode)
if _, err := fmt.Fprint(w, tc.in); err != nil { if _, err := fmt.Fprint(w, tc.in); err != nil {
t.Errorf("error writing teams api response %v", err) t.Errorf("error writing teams api response %v", err)
} }
})) }))
defer ts.Close() defer ts.Close()
api := NewTeamsAPI(ts.URL, logger) api := NewTeamsAPI(ts.URL, logger)
actual, statusCode, err := api.TeamInfo(tc.inTeam, token) actual, statusCode, err := api.TeamInfo(tc.inTeam, token)
if err != nil && err.Error() != tc.err.Error() { if err != nil && err.Error() != tc.err.Error() {
t.Errorf("expected error: %v, got: %v", tc.err, err) t.Errorf("expected error: %v, got: %v", tc.err, err)
return return
} }
if !reflect.DeepEqual(actual, tc.out) { if !reflect.DeepEqual(actual, tc.out) {
t.Errorf("expected %#v, got: %#v", tc.out, actual) t.Errorf("expected %#v, got: %#v", tc.out, actual)
} }
if statusCode != tc.inCode { if statusCode != tc.inCode {
t.Errorf("expected %d, got: %d", tc.inCode, statusCode) t.Errorf("expected %d, got: %d", tc.inCode, statusCode)
} }
}() }()
} }
} }
type mockHTTPClient struct { type mockHTTPClient struct {
} }
type mockBody struct { type mockBody struct {
} }
func (b *mockBody) Read(p []byte) (n int, err error) { func (b *mockBody) Read(p []byte) (n int, err error) {
return 2, nil return 2, nil
} }
func (b *mockBody) Close() error { func (b *mockBody) Close() error {
return fmt.Errorf("close error") return fmt.Errorf("close error")
} }
func (c *mockHTTPClient) Do(req *http.Request) (*http.Response, error) { func (c *mockHTTPClient) Do(req *http.Request) (*http.Response, error) {
resp := http.Response{ resp := http.Response{
Status: "200 OK", Status: "200 OK",
StatusCode: 200, StatusCode: 200,
ContentLength: 2, ContentLength: 2,
Close: false, Close: false,
Request: req, Request: req,
} }
resp.Body = &mockBody{} resp.Body = &mockBody{}
return &resp, nil return &resp, nil
} }
func TestHttpClientClose(t *testing.T) { func TestHttpClientClose(t *testing.T) {
ts := httptest.NewServer(nil) ts := httptest.NewServer(nil)
api := NewTeamsAPI(ts.URL, logger) api := NewTeamsAPI(ts.URL, logger)
api.httpClient = &mockHTTPClient{} api.httpClient = &mockHTTPClient{}
_, _, err := api.TeamInfo("acid", token) _, _, err := api.TeamInfo("acid", token)
expError := fmt.Errorf("error when closing response: close error") expError := fmt.Errorf("error when closing response: close error")
if err.Error() != expError.Error() { if err.Error() != expError.Error() {
t.Errorf("expected error: %v, got: %v", expError, err) t.Errorf("expected error: %v, got: %v", expError, err)
} }
} }
func TestRequest(t *testing.T) { func TestRequest(t *testing.T) {
for _, tc := range requestsURLtc { for _, tc := range requestsURLtc {
api := NewTeamsAPI(tc.url, logger) api := NewTeamsAPI(tc.url, logger)
resp, _, err := api.TeamInfo("acid", token) resp, _, err := api.TeamInfo("acid", token)
if resp != nil { if resp != nil {
t.Errorf("response expected to be nil") t.Errorf("response expected to be nil")
continue continue
} }
if err.Error() != tc.err.Error() { if err.Error() != tc.err.Error() {
t.Errorf("expected error: %v, got: %v", tc.err, err) t.Errorf("expected error: %v, got: %v", tc.err, err)
} }
} }
} }

4
pkg/util/volumes/ebs_test.go
View File

@ -2,9 +2,9 @@ package volumes
import ( import (
"fmt" "fmt"
"testing"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"testing"
) )
func TestGetProviderVolumeID(t *testing.T) { func TestGetProviderVolumeID(t *testing.T) {
@ -88,7 +88,7 @@ func TestVolumeBelongsToProvider(t *testing.T) {
name: "AWS EBS volume handle", name: "AWS EBS volume handle",
pv: &v1.PersistentVolume{ pv: &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string { Annotations: map[string]string{
"pv.kubernetes.io/provisioned-by": "kubernetes.io/aws-ebs", "pv.kubernetes.io/provisioned-by": "kubernetes.io/aws-ebs",
}, },
}, },