Fix grafana schema#263
Open
janboll wants to merge 3 commits into
Open
Conversation
Need to use values for parameters, cause the current approach does not work
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the GrafanaManage pipeline step contract to support parameterized inputs via the shared Value shape (configRef/input/value) and removes tag support that is currently not used, aligning the JSON schema and Go types with the intended pipeline authoring model.
Changes:
- Removed
--tagssupport fromgrafanactl manage reconcileand stopped merging arbitrary tags into the ARM request. - Updated
pipeline.schema.v1.jsonGrafanaManage step properties to use#/definitions/valueand removed thetagsproperty. - Updated
GrafanaManageStepGo type to useValuefields (and removedTags) to match the schema.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| tools/grafanactl/cmd/manage/options.go | Removes Tags option and its CLI flag binding. |
| tools/grafanactl/cmd/manage/cmd.go | Removes merging of user-provided tags into the Grafana ARM resource tags map. |
| pipelines/types/pipeline.schema.v1.json | Switches GrafanaManage step fields to value references and removes tags; updates timeout typing for this step. |
| pipelines/types/common.go | Updates GrafanaManageStep field types to Value and removes Tags to match schema. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
766
to
768
| "zoneRedundancy": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "Enabled", | ||
| "Disabled" | ||
| ] | ||
| "$ref": "#/definitions/value" | ||
| }, |
Comment on lines
772
to
774
| "timeout": { | ||
| "$ref": "#/definitions/durationString" | ||
| "$ref": "#/definitions/value" | ||
| }, |
Comment on lines
754
to
+761
| "grafanaName": { | ||
| "type": "string" | ||
| "$ref": "#/definitions/value" | ||
| }, | ||
| "location": { | ||
| "type": "string" | ||
| "$ref": "#/definitions/value" | ||
| }, | ||
| "sku": { | ||
| "type": "string" | ||
| "$ref": "#/definitions/value" |
Comment on lines
763
to
768
| "majorVersion": { | ||
| "type": "string" | ||
| "$ref": "#/definitions/value" | ||
| }, | ||
| "zoneRedundancy": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "Enabled", | ||
| "Disabled" | ||
| ] | ||
| "$ref": "#/definitions/value" | ||
| }, |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Need to use values for parameters, cause the current approach does not work
Also delete tags, cause we do not have it as of now and it only complicates things.