mirror of https://github.com/fluxcd/flux2.git
Remove deprecated flags
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>pull/3603/head
Stefan Prodan
2 years ago
parent
ea04bc8e47
commit
b44a3d36ba
@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2020 The Flux authors
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package flags
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/fluxcd/flux2/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
var supportedArchs = []string{"amd64", "arm", "arm64"}
|
|
||||||
|
|
||||||
type Arch string
|
|
||||||
|
|
||||||
func (a *Arch) String() string {
|
|
||||||
return string(*a)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *Arch) Set(str string) error {
|
|
||||||
if strings.TrimSpace(str) == "" {
|
|
||||||
return fmt.Errorf("no arch given, must be one of: %s",
|
|
||||||
strings.Join(supportedArchs, ", "))
|
|
||||||
}
|
|
||||||
if !utils.ContainsItemString(supportedArchs, str) {
|
|
||||||
return fmt.Errorf("unsupported arch '%s', must be one of: %s",
|
|
||||||
str, strings.Join(supportedArchs, ", "))
|
|
||||||
|
|
||||||
}
|
|
||||||
*a = Arch(str)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *Arch) Type() string {
|
|
||||||
return "arch"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *Arch) Description() string {
|
|
||||||
return fmt.Sprintf("cluster architecture, available options are: (%s)", strings.Join(supportedArchs, ", "))
|
|
||||||
}
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2020 The Flux authors
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package flags
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestArch_Set(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
str string
|
|
||||||
expect string
|
|
||||||
expectErr bool
|
|
||||||
}{
|
|
||||||
{"supported", "amd64", "amd64", false},
|
|
||||||
{"unsupported", "unsupported", "", true},
|
|
||||||
{"empty", "", "", true},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
var a Arch
|
|
||||||
if err := a.Set(tt.str); (err != nil) != tt.expectErr {
|
|
||||||
t.Errorf("Set() error = %v, expectErr %v", err, tt.expectErr)
|
|
||||||
}
|
|
||||||
if str := a.String(); str != tt.expect {
|
|
||||||
t.Errorf("Set() = %v, expect %v", str, tt.expect)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2021 The Flux authors
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package flags
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
|
|
||||||
|
|
||||||
"github.com/fluxcd/flux2/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
var supportedGitImplementations = []string{sourcev1.GoGitImplementation, sourcev1.LibGit2Implementation}
|
|
||||||
|
|
||||||
type GitImplementation string
|
|
||||||
|
|
||||||
func (i *GitImplementation) String() string {
|
|
||||||
return string(*i)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (i *GitImplementation) Set(str string) error {
|
|
||||||
if str == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if !utils.ContainsItemString(supportedGitImplementations, str) {
|
|
||||||
return fmt.Errorf("unsupported Git implementation '%s', must be one of: %s",
|
|
||||||
str, strings.Join(supportedGitImplementations, ", "))
|
|
||||||
|
|
||||||
}
|
|
||||||
*i = GitImplementation(str)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (i *GitImplementation) Type() string {
|
|
||||||
return "gitImplementation"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (i *GitImplementation) Description() string {
|
|
||||||
return fmt.Sprintf("the Git implementation to use, available options are: (%s)", strings.Join(supportedGitImplementations, ", "))
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
//go:build !e2e
|
|
||||||
// +build !e2e
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright 2021 The Flux authors
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package flags
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestGitImplementation_Set(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
str string
|
|
||||||
expect string
|
|
||||||
expectErr bool
|
|
||||||
}{
|
|
||||||
{"supported", sourcev1.GoGitImplementation, sourcev1.GoGitImplementation, false},
|
|
||||||
{"unsupported", "unsupported", "", true},
|
|
||||||
{"empty", "", "", false},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
var i GitImplementation
|
|
||||||
if err := i.Set(tt.str); (err != nil) != tt.expectErr {
|
|
||||||
t.Errorf("Set() error = %v, expectErr %v", err, tt.expectErr)
|
|
||||||
}
|
|
||||||
if str := i.String(); str != tt.expect {
|
|
||||||
t.Errorf("Set() = %v, expect %v", str, tt.expect)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue