Skip to content

Commit eb84fc6

Browse files
laveryalaverya
authored
Merge pull request #177 from replicatedhq/laverya/remove-per-collector-redactors
remove per-collector redactors
2 parents 7be40dd + 087505f commit eb84fc6

File tree

9 files changed

+107
-146
lines changed

9 files changed

+107
-146
lines changed

‎cmd/troubleshoot/cli/run.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ func runCollectors(v *viper.Viper, collector troubleshootv1beta1.Collector, addi
262262
if additionalRedactors != nil {
263263
globalRedactors = additionalRedactors.Spec.Redactors
264264
}
265-
globalRedactors = append(globalRedactors, collector.Spec.GlobalRedactors...)
266265

267266
// Run preflights collectors synchronously
268267
for _, collector := range collectors {

‎pkg/apis/troubleshoot/v1beta1/collector_shared.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import (
99
)
1010

1111
type CollectorMeta struct {
12-
CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
13-
Redactors []*Redact `json:"redactors,omitempty" yaml:"redactors,omitempty"`
12+
CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
1413
// +optional
1514
Exclude multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
1615
}

‎pkg/apis/troubleshoot/v1beta1/collector_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ type AfterCollection struct {
3434
type CollectorSpec struct {
3535
Collectors []*Collect `json:"collectors,omitempty" yaml:"collectors,omitempty"`
3636
AfterCollection []*AfterCollection `json:"afterCollection,omitempty" yaml:"afterCollection,omitempty"`
37-
GlobalRedactors []*Redact `json:"globalRedactors,omitempty" yaml:"globalRedactors,omitempty"`
3837
}
3938

4039
// CollectorStatus defines the observed state of Collector

‎pkg/apis/troubleshoot/v1beta1/redact_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
// RedactorSpec defines the desired state of Redactor
2424
type RedactorSpec struct {
25-
Redactors []*Redact `json:"redacts,omitempty"`
25+
Redactors []*Redact `json:"redactors,omitempty"`
2626
}
2727

2828
// RedactorStatus defines the observed state of Redactor

‎pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 17 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/collect/collector.go‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
4444
var unRedacted map[string][]byte
4545
var isExcludedResult bool
4646
var err error
47-
var redactors []*troubleshootv1beta1.Redact
4847
if c.Collect.ClusterInfo != nil {
4948
isExcludedResult, err = isExcluded(c.Collect.ClusterInfo.Exclude)
5049
if err != nil {
@@ -54,7 +53,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
5453
return nil, nil
5554
}
5655
unRedacted, err = ClusterInfo(c.GetContext())
57-
redactors = c.Collect.ClusterInfo.Redactors
5856
} else if c.Collect.ClusterResources != nil {
5957
isExcludedResult, err = isExcluded(c.Collect.ClusterResources.Exclude)
6058
if err != nil {
@@ -64,7 +62,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
6462
return nil, nil
6563
}
6664
unRedacted, err = ClusterResources(c.GetContext())
67-
redactors = c.Collect.ClusterResources.Redactors
6865
} else if c.Collect.Secret != nil {
6966
isExcludedResult, err = isExcluded(c.Collect.Secret.Exclude)
7067
if err != nil {
@@ -74,7 +71,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
7471
return nil, nil
7572
}
7673
unRedacted, err = Secret(c.GetContext(), c.Collect.Secret)
77-
redactors = c.Collect.Secret.Redactors
7874
} else if c.Collect.Logs != nil {
7975
isExcludedResult, err = isExcluded(c.Collect.Logs.Exclude)
8076
if err != nil {
@@ -84,7 +80,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
8480
return nil, nil
8581
}
8682
unRedacted, err = Logs(c.GetContext(), c.Collect.Logs)
87-
redactors = c.Collect.Logs.Redactors
8883
} else if c.Collect.Run != nil {
8984
isExcludedResult, err = isExcluded(c.Collect.Run.Exclude)
9085
if err != nil {
@@ -94,7 +89,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
9489
return nil, nil
9590
}
9691
unRedacted, err = Run(c.GetContext(), c.Collect.Run)
97-
redactors = c.Collect.Run.Redactors
9892
} else if c.Collect.Exec != nil {
9993
isExcludedResult, err = isExcluded(c.Collect.Exec.Exclude)
10094
if err != nil {
@@ -104,7 +98,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
10498
return nil, nil
10599
}
106100
unRedacted, err = Exec(c.GetContext(), c.Collect.Exec)
107-
redactors = c.Collect.Exec.Redactors
108101
} else if c.Collect.Data != nil {
109102
isExcludedResult, err = isExcluded(c.Collect.Data.Exclude)
110103
if err != nil {
@@ -114,7 +107,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
114107
return nil, nil
115108
}
116109
unRedacted, err = Data(c.GetContext(), c.Collect.Data)
117-
redactors = c.Collect.Data.Redactors
118110
} else if c.Collect.Copy != nil {
119111
isExcludedResult, err = isExcluded(c.Collect.Copy.Exclude)
120112
if err != nil {
@@ -124,7 +116,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
124116
return nil, nil
125117
}
126118
unRedacted, err = Copy(c.GetContext(), c.Collect.Copy)
127-
redactors = c.Collect.Copy.Redactors
128119
} else if c.Collect.HTTP != nil {
129120
isExcludedResult, err = isExcluded(c.Collect.HTTP.Exclude)
130121
if err != nil {
@@ -134,7 +125,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
134125
return nil, nil
135126
}
136127
unRedacted, err = HTTP(c.GetContext(), c.Collect.HTTP)
137-
redactors = c.Collect.HTTP.Redactors
138128
} else if c.Collect.Postgres != nil {
139129
isExcludedResult, err = isExcluded(c.Collect.Postgres.Exclude)
140130
if err != nil {
@@ -144,7 +134,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
144134
return nil, nil
145135
}
146136
unRedacted, err = Postgres(c.GetContext(), c.Collect.Postgres)
147-
redactors = c.Collect.Postgres.Redactors
148137
} else if c.Collect.Mysql != nil {
149138
isExcludedResult, err = isExcluded(c.Collect.Mysql.Exclude)
150139
if err != nil {
@@ -154,7 +143,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
154143
return nil, nil
155144
}
156145
unRedacted, err = Mysql(c.GetContext(), c.Collect.Mysql)
157-
redactors = c.Collect.Mysql.Redactors
158146
} else if c.Collect.Redis != nil {
159147
isExcludedResult, err = isExcluded(c.Collect.Redis.Exclude)
160148
if err != nil {
@@ -164,7 +152,6 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
164152
return nil, nil
165153
}
166154
unRedacted, err = Redis(c.GetContext(), c.Collect.Redis)
167-
redactors = c.Collect.Redis.Redactors
168155
} else {
169156
return nil, errors.New("no spec found to run")
170157
}
@@ -173,7 +160,7 @@ func (c *Collector) RunCollectorSync(globalRedactors []*troubleshootv1beta1.Reda
173160
return nil, err
174161
}
175162
if c.Redact {
176-
return redactMap(unRedacted, append(redactors, globalRedactors...))
163+
return redactMap(unRedacted, globalRedactors)
177164
}
178165
return unRedacted, nil
179166
}

0 commit comments

Comments
 (0)