feat: migrate experiments config from array to bools #398
+181
−53
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright 2022-2026 Salesforce, Inc. | ||
| // | ||
| // 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 config | ||
|
|
||
| import "encoding/json" | ||
|
|
||
| // unmarshalExperimentsField handles backwards-compatible unmarshaling of the | ||
| // experiments field. It accepts both the old array format (["charm", "sandboxes"]) | ||
| // and the new map format ({"charm": true, "sandboxes": true}). | ||
| func unmarshalExperimentsField(raw json.RawMessage) map[string]bool { | ||
| if len(raw) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| // Try new map format first | ||
| var mapFormat map[string]bool | ||
| if err := json.Unmarshal(raw, &mapFormat); err == nil { | ||
| return mapFormat | ||
| } | ||
|
|
||
| // Fall back to old array format | ||
| var arrayFormat []string | ||
| if err := json.Unmarshal(raw, &arrayFormat); err == nil { | ||
| if len(arrayFormat) == 0 { | ||
| return nil | ||
| } | ||
| result := make(map[string]bool, len(arrayFormat)) | ||
| for _, exp := range arrayFormat { | ||
| result[exp] = true | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,6 @@ import ( | |
| "github.com/google/uuid" | ||
| "github.com/opentracing/opentracing-go" | ||
| "github.com/slackapi/slack-cli/internal/cache" | ||
| "github.com/slackapi/slack-cli/internal/shared/types" | ||
| "github.com/slackapi/slack-cli/internal/slackerror" | ||
| "github.com/slackapi/slack-cli/internal/style" | ||
|
|
@@ -60,7 +59,7 @@ type ProjectConfigManager interface { | |
|
|
||
| // ProjectConfig is the project-level config file | ||
| type ProjectConfig struct { | ||
| Experiments map[string]bool `json:"experiments,omitempty"` | ||
| Manifest *ManifestConfig `json:"manifest,omitempty"` | ||
| ProjectID string `json:"project_id,omitempty"` | ||
| Surveys map[string]SurveyConfig `json:"surveys,omitempty"` | ||
|
|
@@ -72,6 +71,23 @@ type ProjectConfig struct { | |
| os types.Os | ||
| } | ||
|
|
||
| // UnmarshalJSON implements custom JSON unmarshaling for ProjectConfig to support | ||
| // backwards compatibility with the old array format for experiments. | ||
| func (c *ProjectConfig) UnmarshalJSON(data []byte) error { | ||
| type Alias ProjectConfig | ||
| aux := &struct { | ||
| RawExperiments json.RawMessage `json:"experiments,omitempty"` | ||
| *Alias | ||
| }{ | ||
| Alias: (*Alias)(c), | ||
| } | ||
| if err := json.Unmarshal(data, aux); err != nil { | ||
| return err | ||
| } | ||
| c.Experiments = unmarshalExperimentsField(aux.RawExperiments) | ||
| return nil | ||
| } | ||
|
|
||
| // NewProjectConfig read and writes to the project-level configuration file | ||
| func NewProjectConfig(fs afero.Fs, os types.Os) *ProjectConfig { | ||
| projectConfig := &ProjectConfig{ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🪬 question: Can we continue to use strict types of
experimentor is this not allowed as a key?