leviathonbeast/ionscale
1
0
Fork 0
mirror of https://github.com/jsiebens/ionscale.git synced 2026-03-31 15:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove unused code

Browse Source
This commit is contained in:
Johan Siebens
2022-06-05 14:25:58 +02:00
parent da71a43990
commit 9d29644941
12 changed files with 27 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cmd/acl.go
+2 -4
View File
@@ -30,11 +30,10 @@ func getACLConfig() *coral.Command {
command.Flags().BoolVar(&asJson, "json", false, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
@@ -99,11 +98,10 @@ func setACLConfig() *coral.Command {
return err
}
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
internal/cmd/auth_filter.go
+3 -6
View File
@@ -40,11 +40,10 @@ func listAuthFilterCommand() *coral.Command {
command.Flags().Uint64Var(&authMethodID, "auth-method-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
req := &api.ListAuthFiltersRequest{}
@@ -102,11 +101,10 @@ func createAuthFilterCommand() *coral.Command {
}
}
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
@@ -158,11 +156,10 @@ func deleteAuthFilterCommand() *coral.Command {
command.Flags().Uint64Var(&authFilterID, "auth-filter-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
req := &api.DeleteAuthFilterRequest{
AuthFilterId: authFilterID,
internal/cmd/auth_key.go
+3 -6
View File
@@ -46,11 +46,10 @@ func createAuthkeysCommand() *coral.Command {
command.Flags().StringVar(&expiry, "expiry", "180d", "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
@@ -104,11 +103,10 @@ func deleteAuthKeyCommand() *coral.Command {
command.Flags().Uint64Var(&authKeyId, "id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
grpcClient, c, err := target.createGRPCClient()
grpcClient, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
req := api.DeleteAuthKeyRequest{AuthKeyId: authKeyId}
if _, err := grpcClient.DeleteAuthKey(context.Background(), connect.NewRequest(&req)); err != nil {
@@ -138,11 +136,10 @@ func listAuthkeysCommand() *coral.Command {
command.Flags().Uint64Var(&tailnetID, "tailnet-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
internal/cmd/auth_method.go
+2 -4
View File
@@ -34,11 +34,10 @@ func listAuthMethods() *coral.Command {
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
resp, err := client.ListAuthMethods(context.Background(), connect.NewRequest(&api.ListAuthMethodsRequest{}))
@@ -97,11 +96,10 @@ func createOIDCAuthMethodCommand() *coral.Command {
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
req := &api.CreateAuthMethodRequest{
Type: "oidc",
internal/cmd/derp_map.go
+2 -4
View File
@@ -38,11 +38,10 @@ func getDERPMap() *coral.Command {
command.Flags().BoolVar(&asJson, "json", false, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
resp, err := client.GetDERPMap(context.Background(), connect.NewRequest(&api.GetDERPMapRequest{}))
@@ -95,11 +94,10 @@ func setDERPMap() *coral.Command {
command.Flags().StringVar(&file, "file", "", "")
command.RunE = func(command *coral.Command, args []string) error {
grpcClient, c, err := target.createGRPCClient()
grpcClient, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
rawJson, err := ioutil.ReadFile(file)
if err != nil {
internal/cmd/dns.go
+2 -4
View File
@@ -25,11 +25,10 @@ func getDNSConfig() *coral.Command {
command.Flags().Uint64Var(&tailnetID, "tailnet-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
@@ -84,11 +83,10 @@ func setDNSConfig() *coral.Command {
command.Flags().BoolVarP(&overrideLocalDNS, "override-local-dns", "", false, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
internal/cmd/funcs.go
-7
View File
@@ -6,7 +6,6 @@ import (
"github.com/bufbuild/connect-go"
api "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1"
apiconnect "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1/ionscalev1connect"
"io"
)
func findTailnet(client apiconnect.IonscaleServiceClient, tailnet string, tailnetID uint64) (*api.Tailnet, error) {
@@ -46,9 +45,3 @@ func findAuthMethod(client apiconnect.IonscaleServiceClient, authMethod string,
return nil, fmt.Errorf("requested auth method not found or you are not authorized for this tailnet")
}
func safeClose(c io.Closer) {
if c != nil {
_ = c.Close()
}
}
internal/cmd/machine.go
+5 -10
View File
@@ -41,11 +41,10 @@ func deleteMachineCommand() *coral.Command {
command.Flags().Uint64Var(&machineID, "machine-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
req := api.DeleteMachineRequest{MachineId: machineID}
if _, err := client.DeleteMachine(context.Background(), connect.NewRequest(&req)); err != nil {
@@ -73,11 +72,10 @@ func expireMachineCommand() *coral.Command {
command.Flags().Uint64Var(&machineID, "machine-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
req := api.ExpireMachineRequest{MachineId: machineID}
if _, err := client.ExpireMachine(context.Background(), connect.NewRequest(&req)); err != nil {
@@ -108,11 +106,10 @@ func listMachinesCommand() *coral.Command {
command.Flags().Uint64Var(&tailnetID, "tailnet-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
@@ -160,11 +157,10 @@ func getMachineRoutesCommand() *coral.Command {
command.Flags().Uint64Var(&machineID, "machine-id", 0, "")
command.RunE = func(command *coral.Command, args []string) error {
grpcClient, c, err := target.createGRPCClient()
grpcClient, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
req := api.GetMachineRoutesRequest{MachineId: machineID}
resp, err := grpcClient.GetMachineRoutes(context.Background(), connect.NewRequest(&req))
@@ -199,11 +195,10 @@ func setMachineRoutesCommand() *coral.Command {
command.Flags().StringSliceVar(&allowedIps, "allowed-ips", []string{}, "")
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
var prefixes []netaddr.IPPrefix
for _, r := range allowedIps {
internal/cmd/tailnet.go
+3 -6
View File
@@ -40,11 +40,10 @@ func listTailnetsCommand() *coral.Command {
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
resp, err := client.ListTailnets(context.Background(), connect.NewRequest(&api.ListTailnetRequest{}))
@@ -80,11 +79,10 @@ func createTailnetsCommand() *coral.Command {
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
resp, err := client.CreateTailnet(context.Background(), connect.NewRequest(&api.CreateTailnetRequest{Name: name}))
@@ -121,11 +119,10 @@ func deleteTailnetCommand() *coral.Command {
command.RunE = func(command *coral.Command, args []string) error {
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
return err
}
defer safeClose(c)
tailnet, err := findTailnet(client, tailnetName, tailnetID)
if err != nil {
internal/cmd/target.go
+2 -3
View File
@@ -5,7 +5,6 @@ import (
"github.com/jsiebens/ionscale/pkg/client/ionscale"
api "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1/ionscalev1connect"
"github.com/muesli/coral"
"io"
)
const (
@@ -26,14 +25,14 @@ func (t *Target) prepareCommand(cmd *coral.Command) {
cmd.Flags().StringVar(&t.systemAdminKey, "admin-key", "", "If specified, the given value will be used as the key to generate a Bearer token for the call. This can also be specified via the IONSCALE_ADMIN_KEY environment variable.")
}
func (t *Target) createGRPCClient() (api.IonscaleServiceClient, io.Closer, error) {
func (t *Target) createGRPCClient() (api.IonscaleServiceClient, error) {
addr := t.getAddr()
skipVerify := t.getInsecureSkipVerify()
systemAdminKey := t.getSystemAdminKey()
auth, err := ionscale.LoadClientAuth(systemAdminKey)
if err != nil {
return nil, nil, err
return nil, err
}
return ionscale.NewClient(auth, addr, skipVerify)
internal/cmd/version.go
+1 -2
View File
@@ -27,7 +27,7 @@ Client:
Git Revision: %s
`, clientVersion, clientRevision)
client, c, err := target.createGRPCClient()
client, err := target.createGRPCClient()
if err != nil {
fmt.Printf(`
Server:
@@ -35,7 +35,6 @@ Server:
`, err)
return
}
defer safeClose(c)
resp, err := client.GetVersion(context.Background(), connect.NewRequest(&api.GetVersionRequest{}))
if err != nil {