fix: remove supported_if

aquaproj · Jan 3, 2023 · 4a806d3 · 4a806d3
1 parent 0fe5661
commit 4a806d3
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 100 deletions.
diff --git a/pkg/config/registry/package_info.go b/pkg/config/registry/package_info.go
@@ -35,7 +35,6 @@ type PackageInfo struct {
 	FormatOverrides    []*FormatOverride  `yaml:"format_overrides,omitempty" json:"format_overrides,omitempty"`
 	VersionConstraints string             `yaml:"version_constraint,omitempty" json:"version_constraint,omitempty"`
 	VersionOverrides   []*VersionOverride `yaml:"version_overrides,omitempty" json:"version_overrides,omitempty"`
-	SupportedIf        *string            `yaml:"supported_if,omitempty" json:"supported_if,omitempty"`
 	SupportedEnvs      SupportedEnvs      `yaml:"supported_envs,omitempty" json:"supported_envs,omitempty"`
 	VersionFilter      *string            `yaml:"version_filter,omitempty" json:"version_filter,omitempty"`
 	Rosetta2           *bool              `yaml:",omitempty" json:"rosetta2,omitempty"`
@@ -68,7 +67,6 @@ func (pkgInfo *PackageInfo) Copy() *PackageInfo {
 		FormatOverrides:    pkgInfo.FormatOverrides,
 		VersionConstraints: pkgInfo.VersionConstraints,
 		VersionOverrides:   pkgInfo.VersionOverrides,
-		SupportedIf:        pkgInfo.SupportedIf,
 		SupportedEnvs:      pkgInfo.SupportedEnvs,
 		VersionFilter:      pkgInfo.VersionFilter,
 		Rosetta2:           pkgInfo.Rosetta2,
@@ -119,9 +117,6 @@ func (pkgInfo *PackageInfo) overrideVersion(child *VersionOverride) *PackageInfo
 	if child.FormatOverrides != nil {
 		pkg.FormatOverrides = child.FormatOverrides
 	}
-	if child.SupportedIf != nil {
-		pkg.SupportedIf = child.SupportedIf
-	}
 	if child.SupportedEnvs != nil {
 		pkg.SupportedEnvs = child.SupportedEnvs
 	}
@@ -227,7 +222,6 @@ type VersionOverride struct {
 	Replacements       Replacements      `yaml:",omitempty" json:"replacements,omitempty"`
 	Overrides          []*Override       `yaml:",omitempty" json:"overrides,omitempty"`
 	FormatOverrides    []*FormatOverride `yaml:"format_overrides,omitempty" json:"format_overrides,omitempty"`
-	SupportedIf        *string           `yaml:"supported_if,omitempty" json:"supported_if,omitempty"`
 	SupportedEnvs      SupportedEnvs     `yaml:"supported_envs,omitempty" json:"supported_envs,omitempty"`
 	VersionConstraints string            `yaml:"version_constraint,omitempty" json:"version_constraint,omitempty"`
 	VersionFilter      *string           `yaml:"version_filter,omitempty" json:"version_filter,omitempty"`

diff --git a/pkg/config/registry/supported_envs.go b/pkg/config/registry/supported_envs.go
@@ -1,18 +1,14 @@
 package registry
 
 import (
-	"github.com/aquaproj/aqua/pkg/expr"
 	"github.com/aquaproj/aqua/pkg/runtime"
 )
 
 func (pkgInfo *PackageInfo) CheckSupported(rt *runtime.Runtime, env string) (bool, error) {
 	if pkgInfo.SupportedEnvs != nil {
 		return pkgInfo.CheckSupportedEnvs(rt.GOOS, rt.GOARCH, env), nil
 	}
-	if pkgInfo.SupportedIf == nil {
-		return true, nil
-	}
-	return expr.EvaluateSupportedIf(pkgInfo.SupportedIf, rt) //nolint:wrapcheck
+	return true, nil
 }
 
 func (pkgInfo *PackageInfo) CheckSupportedEnvs(goos, goarch, env string) bool {

diff --git a/pkg/controller/which/which_test.go b/pkg/controller/which/which_test.go
@@ -177,7 +177,6 @@ packages:
   repo_owner: suzuki-shunsuke
   repo_name: ci-info
   asset: "ci-info_{{.Arch}}-{{.OS}}.tar.gz"
-  supported_if: "false"
 - type: github_release
   repo_owner: suzuki-shunsuke
   repo_name: github-comment

diff --git a/pkg/expr/package_condition.go b/pkg/expr/package_condition.go
diff --git a/pkg/expr/package_condition_test.go b/pkg/expr/package_condition_test.go
diff --git a/pkg/installpackage/installer_test.go b/pkg/installpackage/installer_test.go
@@ -68,11 +68,6 @@ func Test_installer_InstallPackages(t *testing.T) { //nolint:funlen
 						Registry: "standard",
 						Version:  "v2.0.3",
 					},
-					{
-						Name:     "suzuki-shunsuke/github-comment",
-						Registry: "standard",
-						Version:  "v4.1.0",
-					},
 				},
 			},
 			registries: map[string]*registry.Config{
@@ -84,13 +79,6 @@ func Test_installer_InstallPackages(t *testing.T) { //nolint:funlen
 							RepoName:  "ci-info",
 							Asset:     stringP("ci-info_{{trimV .Version}}_{{.OS}}_amd64.tar.gz"),
 						},
-						{
-							Type:        "github_release",
-							RepoOwner:   "suzuki-shunsuke",
-							RepoName:    "github-comment",
-							Asset:       stringP("github-comment_{{trimV .Version}}_{{.OS}}_amd64.tar.gz"),
-							SupportedIf: stringP("false"),
-						},
 					},
 				},
 			},

diff --git a/tests/main/aqua-global.yaml b/tests/main/aqua-global.yaml
@@ -35,9 +35,6 @@ packages:
 - name: tfutils/tfenv@v3.0.0
   # github_archive package
   registry: local
-- name: containerd/nerdctl@v1.0.0
-  # supported_if
-  registry: local
 - name: aristocratos/btop@v1.2.12
   # replacements_overrides
   registry: local

diff --git a/tests/main/registry.yaml b/tests/main/registry.yaml
@@ -43,12 +43,6 @@ packages:
     - name: terraform
       src: tfenv-{{trimV .Version}}/bin/terraform
 
-  - type: github_release
-    repo_owner: containerd
-    repo_name: nerdctl
-    asset: 'nerdctl-{{trimV .Version}}-{{.OS}}-{{.Arch}}.tar.gz'
-    supported_if: GOOS != "darwin" # supported_if
-
   - type: github_release
     repo_owner: aristocratos
     repo_name: btop