mirror of
https://github.com/redhat-developer/odo.git
synced 2025-10-19 03:06:19 +03:00
Removes docker related code (#4634)
* Removes docker related code * Remove pushtarget tests from unit tests * Makes `go vet` happy * Makes `wwhrd check -q` happy * Removes docker url code * Removes docker tests
This commit is contained in:
@@ -79,13 +79,6 @@ func toPreferenceItems(prefInfo PreferenceInfo) []PreferenceItem {
|
||||
Type: getType(prefInfo.GetExperimental()),
|
||||
Description: ExperimentalDescription,
|
||||
},
|
||||
{
|
||||
Name: PushTargetSetting,
|
||||
Value: odoSettings.PushTarget,
|
||||
Default: KubePushTarget,
|
||||
Type: getType(prefInfo.GetPushTarget()),
|
||||
Description: PushTargetDescription,
|
||||
},
|
||||
{
|
||||
Name: ConsentTelemetrySetting,
|
||||
Value: odoSettings.ConsentTelemetry,
|
||||
|
||||
@@ -59,23 +59,9 @@ const (
|
||||
// ExperimentalDescription is human-readable description for the experimental setting
|
||||
ExperimentalDescription = "Set this value to true to expose features in development/experimental mode"
|
||||
|
||||
// PushTargetSetting is the name of the setting confrolling the push target for odo (docker or kube)
|
||||
PushTargetSetting = "PushTarget"
|
||||
|
||||
// PushTargetDescription is human-readable description for the pushtarget setting
|
||||
PushTargetDescription = "Set this value to 'kube' or 'docker' to tell odo where to push applications to. (Default: kube)"
|
||||
|
||||
// RegistryCacheTimeSetting is human-readable description for the registrycachetime setting
|
||||
RegistryCacheTimeSetting = "RegistryCacheTime"
|
||||
|
||||
// Constants for PushTarget values
|
||||
|
||||
// DockerPushTarget represents the value of the push target when it's set to Docker
|
||||
DockerPushTarget = "docker"
|
||||
|
||||
// KubePushTarget represents the value of the push target when it's set to Kube
|
||||
KubePushTarget = "kube"
|
||||
|
||||
// DefaultDevfileRegistryName is the name of default devfile registry
|
||||
DefaultDevfileRegistryName = "DefaultDevfileRegistry"
|
||||
|
||||
@@ -129,7 +115,6 @@ var (
|
||||
BuildTimeoutSetting: BuildTimeoutSettingDescription,
|
||||
PushTimeoutSetting: PushTimeoutSettingDescription,
|
||||
ExperimentalSetting: ExperimentalDescription,
|
||||
PushTargetSetting: PushTargetDescription,
|
||||
RegistryCacheTimeSetting: RegistryCacheTimeDescription,
|
||||
EphemeralSetting: EphemeralDescription,
|
||||
ConsentTelemetrySetting: ConsentTelemetryDescription,
|
||||
@@ -166,9 +151,6 @@ type OdoSettings struct {
|
||||
// Experimental for exposing features in development/experimental mode
|
||||
Experimental *bool `yaml:"Experimental,omitempty"`
|
||||
|
||||
// PushTarget for telling odo which platform to push to (either kube or docker)
|
||||
PushTarget *string `yaml:"PushTarget,omitempty"`
|
||||
|
||||
// RegistryList for telling odo to connect to all the registries in the registry list
|
||||
RegistryList *[]Registry `yaml:"RegistryList,omitempty"`
|
||||
|
||||
@@ -453,13 +435,6 @@ func (c *PreferenceInfo) SetConfiguration(parameter string, value string) error
|
||||
}
|
||||
c.OdoSettings.Ephemeral = &val
|
||||
|
||||
case "pushtarget":
|
||||
val := strings.ToLower(value)
|
||||
if val != DockerPushTarget && val != KubePushTarget {
|
||||
return errors.Errorf("cannot set pushtarget to values other than %q or %q", DockerPushTarget, KubePushTarget)
|
||||
}
|
||||
c.OdoSettings.PushTarget = &val
|
||||
|
||||
case "consenttelemetry":
|
||||
val, err := strconv.ParseBool(strings.ToLower(value))
|
||||
if err != nil {
|
||||
@@ -552,13 +527,6 @@ func (c *PreferenceInfo) GetExperimental() bool {
|
||||
return util.GetBoolOrDefault(c.OdoSettings.Experimental, false)
|
||||
}
|
||||
|
||||
// GetPushTarget returns the value of PushTarget from preferences
|
||||
// and if absent then returns default
|
||||
// default value: kube, docker push target needs to be manually enabled
|
||||
func (c *PreferenceInfo) GetPushTarget() string {
|
||||
return util.GetStringOrDefault(c.OdoSettings.PushTarget, KubePushTarget)
|
||||
}
|
||||
|
||||
// GetConsentTelemetry returns the value of ConsentTelemetry from preferences
|
||||
// and if absent then returns default
|
||||
// default value: false, consent telemetry is disabled by default
|
||||
|
||||
@@ -248,8 +248,6 @@ func TestSetConfiguration(t *testing.T) {
|
||||
os.Setenv(GlobalConfigEnvName, tempConfigFile.Name())
|
||||
trueValue := true
|
||||
falseValue := false
|
||||
dockerValue := DockerPushTarget
|
||||
kubeValue := KubePushTarget
|
||||
zeroValue := 0
|
||||
|
||||
tests := []struct {
|
||||
@@ -437,46 +435,6 @@ func TestSetConfiguration(t *testing.T) {
|
||||
existingConfig: Preference{},
|
||||
wantErr: true,
|
||||
},
|
||||
// pushtarget setting
|
||||
{
|
||||
name: fmt.Sprintf("Case 21: %s set nil to docker", PushTargetSetting),
|
||||
parameter: PushTargetSetting,
|
||||
value: dockerValue,
|
||||
existingConfig: Preference{},
|
||||
want: dockerValue,
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: fmt.Sprintf("Case 22: %s set kube to docker", PushTargetSetting),
|
||||
parameter: PushTargetSetting,
|
||||
value: dockerValue,
|
||||
existingConfig: Preference{
|
||||
OdoSettings: OdoSettings{
|
||||
PushTarget: &kubeValue,
|
||||
},
|
||||
},
|
||||
want: dockerValue,
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: fmt.Sprintf("Case 23: %s set docker to kube", PushTargetSetting),
|
||||
parameter: PushTargetSetting,
|
||||
value: kubeValue,
|
||||
existingConfig: Preference{
|
||||
OdoSettings: OdoSettings{
|
||||
PushTarget: &dockerValue,
|
||||
},
|
||||
},
|
||||
want: kubeValue,
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: fmt.Sprintf("Case 24: %s invalid value", PushTargetSetting),
|
||||
parameter: PushTargetSetting,
|
||||
value: "invalid_value",
|
||||
existingConfig: Preference{},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "Case 25: set RegistryCacheTime to 1",
|
||||
parameter: "RegistryCacheTime",
|
||||
@@ -545,10 +503,6 @@ func TestSetConfiguration(t *testing.T) {
|
||||
if *cfg.OdoSettings.Experimental != tt.want {
|
||||
t.Errorf("unexpected value after execution of SetConfiguration\ngot: %v \nexpected: %d\n", cfg.OdoSettings.Experimental, tt.want)
|
||||
}
|
||||
case "pushtarget":
|
||||
if *cfg.OdoSettings.PushTarget != tt.want {
|
||||
t.Errorf("unexpected value after execution of SetConfiguration\ngot: %v \nexpected: %d\n", cfg.OdoSettings.PushTarget, tt.want)
|
||||
}
|
||||
case "registrycachetime":
|
||||
if *cfg.OdoSettings.RegistryCacheTime != tt.want {
|
||||
t.Errorf("unexpected value after execution of SetConfiguration\ngot: %v \nexpected: %d\n", *cfg.OdoSettings.RegistryCacheTime, tt.want)
|
||||
@@ -741,62 +695,6 @@ func TestGetExperimental(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetPushTarget(t *testing.T) {
|
||||
|
||||
tempConfigFile, err := ioutil.TempFile("", "odoconfig")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer tempConfigFile.Close()
|
||||
os.Setenv(GlobalConfigEnvName, tempConfigFile.Name())
|
||||
dockerValue := "docker"
|
||||
kubeValue := "kube"
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
existingConfig Preference
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: fmt.Sprintf("Case 1: %s nil", PushTargetSetting),
|
||||
existingConfig: Preference{},
|
||||
want: "kube",
|
||||
},
|
||||
{
|
||||
name: fmt.Sprintf("Case 2: %s docker", PushTargetSetting),
|
||||
existingConfig: Preference{
|
||||
OdoSettings: OdoSettings{
|
||||
PushTarget: &dockerValue,
|
||||
},
|
||||
},
|
||||
want: "docker",
|
||||
},
|
||||
{
|
||||
name: fmt.Sprintf("Case 3: %s kube", PushTargetSetting),
|
||||
existingConfig: Preference{
|
||||
OdoSettings: OdoSettings{
|
||||
PushTarget: &kubeValue,
|
||||
},
|
||||
},
|
||||
want: "kube",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
cfg := PreferenceInfo{
|
||||
Preference: tt.existingConfig,
|
||||
}
|
||||
output := cfg.GetPushTarget()
|
||||
|
||||
if output != tt.want {
|
||||
t.Errorf("GetExperimental returned unexpected value\ngot: %s \nexpected: %s\n", output, tt.want)
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsSupportedParameter(t *testing.T) {
|
||||
tests := []struct {
|
||||
testName string
|
||||
|
||||
Reference in New Issue
Block a user