analyzer: cleanup unused params (istio#43764)

* analyzer: cleanup unused params This is never used / always true * cleanup * lint * fmt
WillardHu · Mar 6, 2023 · 6216aa0 · 6216aa0
1 parent 4cec869
commit 6216aa0
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 39 deletions.
diff --git a/istioctl/cmd/analyze.go b/istioctl/cmd/analyze.go
@@ -153,7 +153,7 @@ func Analyze() *cobra.Command {
 
 			sa := local.NewIstiodAnalyzer(analyzers.AllCombined(),
 				resource.Namespace(selectedNamespace),
-				resource.Namespace(istioNamespace), nil, true)
+				resource.Namespace(istioNamespace), nil)
 
 			// Check for suppressions and add them to our SourceAnalyzer
 			suppressions := make([]local.AnalysisSuppression, 0, len(suppress))

diff --git a/istioctl/cmd/precheck.go b/istioctl/cmd/precheck.go
@@ -130,8 +130,12 @@ func checkControlPlane(cli kube.CLIClient) (diag.Messages, error) {
 
 	// TODO: add more checks
 
-	sa := local.NewSourceAnalyzer(analysis.Combine("upgrade precheck", &maturity.AlphaAnalyzer{}),
-		resource.Namespace(selectedNamespace), resource.Namespace(istioNamespace), nil, true, analysisTimeout)
+	sa := local.NewSourceAnalyzer(
+		analysis.Combine("upgrade precheck", &maturity.AlphaAnalyzer{}),
+		resource.Namespace(selectedNamespace),
+		resource.Namespace(istioNamespace),
+		nil,
+	)
 	// Set up the kube client
 	config := kube.BuildClientCmd(kubeconfig, configContext)
 	restConfig, err := config.ClientConfig()

diff --git a/istioctl/cmd/tag.go b/istioctl/cmd/tag.go
@@ -315,8 +315,7 @@ func setTag(ctx context.Context, kubeClient kube.CLIClient, tagName, revision, i
 }
 
 func analyzeWebhook(name, wh, revision string, config *rest.Config) error {
-	sa := local.NewSourceAnalyzer(analysis.Combine("webhook", &webhook.Analyzer{}),
-		resource.Namespace(selectedNamespace), resource.Namespace(istioNamespace), nil, true, analysisTimeout)
+	sa := local.NewSourceAnalyzer(analysis.Combine("webhook", &webhook.Analyzer{}), resource.Namespace(selectedNamespace), resource.Namespace(istioNamespace), nil)
 	if err := sa.AddReaderKubeSource([]local.ReaderSource{{Name: "", Reader: strings.NewReader(wh)}}); err != nil {
 		return err
 	}

diff --git a/operator/pkg/helmreconciler/reconciler.go b/operator/pkg/helmreconciler/reconciler.go
@@ -522,8 +522,7 @@ func (h *HelmReconciler) analyzeWebhooks(whs []string) error {
 
 	sa := local.NewSourceAnalyzer(analysis.Combine("webhook", &webhook.Analyzer{
 		SkipServiceCheck: true,
-	}),
-		resource.Namespace(h.iop.Spec.GetNamespace()), resource.Namespace(istioV1Alpha1.Namespace(h.iop.Spec)), nil, true, 30*time.Second)
+	}), resource.Namespace(h.iop.Spec.GetNamespace()), resource.Namespace(istioV1Alpha1.Namespace(h.iop.Spec)), nil)
 	var localWebhookYAMLReaders []local.ReaderSource
 	var parsedK8sObjects object.K8sObjects
 	for _, wh := range whs {

diff --git a/pkg/config/analysis/analyzers/analyzers_test.go b/pkg/config/analysis/analyzers/analyzers_test.go
@@ -20,7 +20,6 @@ import (
 	"regexp"
 	"strings"
 	"testing"
-	"time"
 
 	. "github.com/onsi/gomega"
 
@@ -899,7 +898,7 @@ func TestAnalyzersHaveDescription(t *testing.T) {
 }
 
 func setupAnalyzerForCase(tc testCase, cr local.CollectionReporterFn) (*local.IstiodAnalyzer, error) {
-	sa := local.NewSourceAnalyzer(analysis.Combine("testCase", tc.analyzer), "", "istio-system", cr, true, 10*time.Second)
+	sa := local.NewSourceAnalyzer(analysis.Combine("testCase", tc.analyzer), "", "istio-system", cr)
 
 	// If a mesh config file is specified, use it instead of the defaults
 	if tc.meshConfigFile != "" {

diff --git a/pkg/config/analysis/incluster/controller.go b/pkg/config/analysis/incluster/controller.go
@@ -47,8 +47,7 @@ type Controller struct {
 func NewController(stop <-chan struct{}, rwConfigStore model.ConfigStoreController,
 	kubeClient kube.Client, revision, namespace string, statusManager *status.Manager, domainSuffix string,
 ) (*Controller, error) {
-	ia := local.NewIstiodAnalyzer(analyzers.AllCombined(),
-		"", resource.Namespace(namespace), func(name config.GroupVersionKind) {}, true)
+	ia := local.NewIstiodAnalyzer(analyzers.AllCombined(), "", resource.Namespace(namespace), func(name config.GroupVersionKind) {})
 	ia.AddSource(rwConfigStore)
 	// Filter out configs watched by rwConfigStore so we don't watch multiple times
 	store, err := crdclient.NewForSchemas(kubeClient,

diff --git a/pkg/config/analysis/local/analyze_test.go b/pkg/config/analysis/local/analyze_test.go
@@ -19,7 +19,6 @@ import (
 	"os"
 	"strings"
 	"testing"
-	"time"
 
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
@@ -57,7 +56,6 @@ spec:
   n1_i1: v1
 `
 	blankCombinedAnalyzer = analysis.Combine("testCombined", blankTestAnalyzer)
-	timeout               = 1 * time.Second
 )
 
 // Metadata implements Analyzer
@@ -78,7 +76,7 @@ func TestAbortWithNoSources(t *testing.T) {
 
 	cancel := make(chan struct{})
 
-	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil, false, timeout)
+	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil)
 	_, err := sa.Analyze(cancel)
 	g.Expect(err).To(Not(BeNil()))
 }
@@ -102,7 +100,7 @@ func TestAnalyzersRun(t *testing.T) {
 		collectionAccessed = col
 	}
 
-	sa := NewSourceAnalyzer(analysis.Combine("a", a), "", "", cr, false, timeout)
+	sa := NewSourceAnalyzer(analysis.Combine("a", a), "", "", cr)
 	err := sa.AddReaderKubeSource(nil)
 	g.Expect(err).To(BeNil())
 
@@ -129,7 +127,7 @@ func TestFilterOutputByNamespace(t *testing.T) {
 		},
 	}
 
-	sa := NewSourceAnalyzer(analysis.Combine("a", a), "ns1", "", nil, false, timeout)
+	sa := NewSourceAnalyzer(analysis.Combine("a", a), "ns1", "", nil)
 	err := sa.AddReaderKubeSource(nil)
 	g.Expect(err).To(BeNil())
 
@@ -141,7 +139,7 @@ func TestFilterOutputByNamespace(t *testing.T) {
 func TestAddInMemorySource(t *testing.T) {
 	g := NewWithT(t)
 
-	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil, false, timeout)
+	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil)
 
 	src := model.NewFakeStore()
 	sa.AddSource(dfCache{ConfigStore: src})
@@ -155,7 +153,7 @@ func TestAddRunningKubeSource(t *testing.T) {
 
 	mk := kube.NewFakeClient()
 
-	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil, false, timeout)
+	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil)
 
 	sa.AddRunningKubeSource(mk)
 	assert.Equal(t, sa.meshCfg, mesh.DefaultMeshConfig()) // Base default meshcfg
@@ -185,7 +183,7 @@ func TestAddRunningKubeSourceWithIstioMeshConfigMap(t *testing.T) {
 		t.Fatalf("Error creating mesh config configmap: %v", err)
 	}
 
-	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", istioNamespace, nil, false, timeout)
+	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", istioNamespace, nil)
 
 	sa.AddRunningKubeSource(mk)
 	g.Expect(sa.meshCfg.RootNamespace).To(Equal(testRootNamespace))
@@ -196,7 +194,7 @@ func TestAddRunningKubeSourceWithIstioMeshConfigMap(t *testing.T) {
 func TestAddReaderKubeSource(t *testing.T) {
 	g := NewWithT(t)
 
-	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil, false, timeout)
+	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil)
 
 	tmpfile := tempFileFromString(t, YamlN1I1V1)
 	defer os.Remove(tmpfile.Name())
@@ -219,7 +217,7 @@ func TestAddReaderKubeSource(t *testing.T) {
 func TestAddReaderKubeSourceSkipsBadEntries(t *testing.T) {
 	g := NewWithT(t)
 
-	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil, false, timeout)
+	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil)
 
 	tmpfile := tempFileFromString(t, JoinString(YamlN1I1V1, "bogus resource entry\n"))
 	defer func() { _ = os.Remove(tmpfile.Name()) }()
@@ -257,7 +255,7 @@ func JoinString(parts ...string) string {
 func TestDefaultResourcesRespectsMeshConfig(t *testing.T) {
 	g := NewWithT(t)
 
-	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil, false, timeout)
+	sa := NewSourceAnalyzer(blankCombinedAnalyzer, "", "", nil)
 
 	// With ingress off, we shouldn't generate any default resources
 	ingressOffMeshCfg := tempFileFromString(t, "ingressControllerMode: 'OFF'")

diff --git a/pkg/config/analysis/local/istiod_analyze.go b/pkg/config/analysis/local/istiod_analyze.go
@@ -20,7 +20,6 @@ import (
 	"io"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/ryanuber/go-glob"
@@ -85,17 +84,15 @@ type IstiodAnalyzer struct {
 }
 
 // NewSourceAnalyzer is a drop-in replacement for the galley function, adapting to istiod analyzer.
-func NewSourceAnalyzer(analyzer *analysis.CombinedAnalyzer, namespace, istioNamespace resource.Namespace,
-	cr CollectionReporterFn, serviceDiscovery bool, _ time.Duration,
-) *IstiodAnalyzer {
-	return NewIstiodAnalyzer(analyzer, namespace, istioNamespace, cr, serviceDiscovery)
+func NewSourceAnalyzer(analyzer *analysis.CombinedAnalyzer, namespace, istioNamespace resource.Namespace, cr CollectionReporterFn) *IstiodAnalyzer {
+	return NewIstiodAnalyzer(analyzer, namespace, istioNamespace, cr)
 }
 
 // NewIstiodAnalyzer creates a new IstiodAnalyzer with no sources. Use the Add*Source
 // methods to add sources in ascending precedence order,
 // then execute Analyze to perform the analysis
 func NewIstiodAnalyzer(analyzer *analysis.CombinedAnalyzer, namespace,
-	istioNamespace resource.Namespace, cr CollectionReporterFn, serviceDiscovery bool,
+	istioNamespace resource.Namespace, cr CollectionReporterFn,
 ) *IstiodAnalyzer {
 	// collectionReporter hook function defaults to no-op
 	if cr == nil {
@@ -105,8 +102,7 @@ func NewIstiodAnalyzer(analyzer *analysis.CombinedAnalyzer, namespace,
 	// Get the closure of all input collections for our analyzer, paying attention to transforms
 	kubeResources := kuberesource.SkipExcludedCollections(
 		analyzer.Metadata().Inputs,
-		kuberesource.DefaultExcludedResourceKinds(),
-		serviceDiscovery)
+		kuberesource.DefaultExcludedResourceKinds())
 
 	mcfg := mesh.DefaultMeshConfig()
 	sa := &IstiodAnalyzer{

diff --git a/pkg/config/legacy/util/kuberesource/resources.go b/pkg/config/legacy/util/kuberesource/resources.go
@@ -23,7 +23,7 @@ import (
 	"istio.io/istio/pkg/config/schema/resource"
 )
 
-func SkipExcludedCollections(requiredCols []config.GroupVersionKind, excludedResourceKinds []string, enableServiceDiscovery bool) collection.Schemas {
+func SkipExcludedCollections(requiredCols []config.GroupVersionKind, excludedResourceKinds []string) collection.Schemas {
 	resultBuilder := collection.NewSchemasBuilder()
 	for _, gv := range requiredCols {
 		s, f := collections.All.FindByGroupVersionKind(gv)
@@ -36,11 +36,9 @@ func SkipExcludedCollections(requiredCols []config.GroupVersionKind, excludedRes
 			disabled = true
 
 			// Check and see if this is needed for Service Discovery. If needed, we will need to re-enable.
-			if enableServiceDiscovery {
-				if IsRequiredForServiceDiscovery(s) {
-					// This is needed for service discovery. Re-enable.
-					disabled = false
-				}
+			if IsRequiredForServiceDiscovery(s) {
+				// This is needed for service discovery. Re-enable.
+				disabled = false
 			}
 		}
 

diff --git a/tests/fuzz/analyzer_fuzzer.go b/tests/fuzz/analyzer_fuzzer.go
@@ -17,7 +17,6 @@ package fuzz
 import (
 	"bytes"
 	"os"
-	"time"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
@@ -141,7 +140,7 @@ func FuzzAnalyzer(data []byte) int {
 		return 0
 	}
 
-	sa := local.NewSourceAnalyzer(analysis.Combine("testCase", analyzer), "", "istio-system", cr, true, 10*time.Second)
+	sa := local.NewSourceAnalyzer(analysis.Combine("testCase", analyzer), "", "istio-system", cr)
 	if addMeshConfig {
 		err = sa.AddFileKubeMeshConfig(meshConfigFile)
 		if err != nil {

diff --git a/tools/bug-report/pkg/content/content.go b/tools/bug-report/pkg/content/content.go
@@ -213,7 +213,7 @@ func GetNetstat(p *Params) (map[string]string, error) {
 // GetAnalyze returns the output of istioctl analyze.
 func GetAnalyze(p *Params, timeout time.Duration) (map[string]string, error) {
 	out := make(map[string]string)
-	sa := local.NewSourceAnalyzer(analyzers.AllCombined(), resource.Namespace(p.Namespace), resource.Namespace(p.IstioNamespace), nil, true, timeout)
+	sa := local.NewSourceAnalyzer(analyzers.AllCombined(), resource.Namespace(p.Namespace), resource.Namespace(p.IstioNamespace), nil)
 
 	k, err := kube.NewClient(kube.NewClientConfigForRestConfig(p.Runner.Client.RESTConfig()))
 	if err != nil {