Skip to content

Commit 093748e

Browse files
refactor: remove command with only deprectated subcommands
As all subcommands are deprecated we will simply remove this command.
1 parent 701e52b commit 093748e

7 files changed

Lines changed: 0 additions & 210 deletions

File tree

internal/aiven/aiven_services/kafka.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
package aiven_services
22

33
import (
4-
"fmt"
5-
"strings"
6-
74
aiven_nais_io_v1 "github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
85
)
96

107
type KafkaPool string
118

12-
func KafkaPoolFromString(pool string) (KafkaPool, error) {
13-
if !strings.Contains(pool, "-") {
14-
return "", fmt.Errorf("invalid pool: %v", pool)
15-
}
16-
return KafkaPool(pool), nil
17-
}
18-
199
func (p KafkaPool) String() string {
2010
return string(p)
2111
}

internal/aiven/aiven_services/opensearch.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,14 @@ package aiven_services
22

33
import (
44
"fmt"
5-
"strings"
65

76
aiven_nais_io_v1 "github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
87
)
98

109
type OpenSearchAccess int64
1110

12-
const (
13-
Read OpenSearchAccess = iota
14-
Write
15-
ReadWrite
16-
Admin
17-
)
18-
1911
var OpenSearchAccesses = []string{"read", "write", "readwrite", "admin"}
2012

21-
func OpenSearchAccessFromString(access string) (OpenSearchAccess, error) {
22-
switch strings.ToLower(access) {
23-
case OpenSearchAccesses[0]:
24-
return Read, nil
25-
case OpenSearchAccesses[1]:
26-
return Write, nil
27-
case OpenSearchAccesses[2]:
28-
return ReadWrite, nil
29-
case OpenSearchAccesses[3]:
30-
return Admin, nil
31-
default:
32-
return -1, fmt.Errorf("unknown access: %v", access)
33-
}
34-
}
35-
3613
func (p OpenSearchAccess) String() string {
3714
return OpenSearchAccesses[p]
3815
}

internal/aiven/command/aiven.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ func Aiven(parentFlags *flags.GlobalFlags) *naistrix.Command {
1919
Description: "Commands for creating, retrieving, and granting access to Aiven-managed services such as Kafka and OpenSearch.",
2020
StickyFlags: aivenFlags,
2121
SubCommands: []*naistrix.Command{
22-
create(aivenFlags),
2322
get(aivenFlags),
2423
tidy(aivenFlags),
2524
grantAccess(aivenFlags),

internal/aiven/command/create.go

Lines changed: 0 additions & 31 deletions
This file was deleted.

internal/aiven/command/create_kafka.go

Lines changed: 0 additions & 65 deletions
This file was deleted.

internal/aiven/command/create_opensearch.go

Lines changed: 0 additions & 71 deletions
This file was deleted.

internal/aiven/secret.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import (
55
"errors"
66
"fmt"
77
"os"
8-
"strings"
98

109
"github.com/nais/cli/internal/aiven/aiven_config"
1110
"github.com/nais/cli/internal/aiven/aiven_services"
1211
"github.com/nais/cli/internal/k8s"
13-
"github.com/nais/liberator/pkg/namegen"
1412
"github.com/nais/naistrix"
1513
v1 "k8s.io/api/core/v1"
1614
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -128,10 +126,3 @@ func createDefaultDestination() (string, error) {
128126

129127
return newPath, nil
130128
}
131-
132-
func CreateSecretName(username, namespace string) (string, error) {
133-
return namegen.ShortName(
134-
fmt.Sprintf("%s-%s", username, strings.ReplaceAll(namespace, ".", "-")),
135-
64,
136-
)
137-
}

0 commit comments

Comments
 (0)