Skip to content

fix: Makes draft optional for scorecards #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2025
Merged

fix: Makes draft optional for scorecards #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ HOSTNAME=github.com
NAMESPACE=cortexapps
NAME=cortex
BINARY=terraform-provider-${NAME}
VERSION=0.4.3-dev
VERSION=0.4.4-dev

GOOS?=$(shell go env | grep GOOS | cut -d '=' -f2 | tr -d "'")
GOARCH?=$(shell go env | grep GOARCH | cut -d '=' -f2 | tr -d "'")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Add the following block into your Terraform files (note that this provider requi
terraform {
required_providers {
cortex = {
source = "cortex/cortex"
source = "cortexapps/cortex"
version = ">= 0.1"
}
}
Expand Down
3 changes: 3 additions & 0 deletions internal/provider/scorecard_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package provider
import (
"context"
"fmt"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"

"github.com/cortexapps/terraform-provider-cortex/internal/cortex"
"github.com/hashicorp/terraform-plugin-framework/path"
Expand Down Expand Up @@ -129,6 +130,8 @@ func (r *ScorecardResource) Schema(ctx context.Context, req resource.SchemaReque
"draft": schema.BoolAttribute{
MarkdownDescription: "Whether the scorecard is a draft.",
Optional: true,
Computed: true,
Default: booldefault.StaticBool(false),
},
"filter": schema.SingleNestedAttribute{
MarkdownDescription: "Filter of the scorecard.",
Expand Down
70 changes: 70 additions & 0 deletions internal/provider/scorecard_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,46 @@ resource %[1]q %[2]q {
}`, t.ResourceType(), t.Tag, t.Name, t.Draft)
}

func (t *testScorecardResource) ToTerraformWithoutDraft() string {
return fmt.Sprintf(`
resource %[1]q %[2]q {
tag = %[2]q
name = %[3]q
description = %[4]q
rules = [
{
title = "Has a Description"
expression = "description != null"
weight = 1
level = "Bronze"
failure_message = "The description is required"
description = "The service has a description"
}
]
ladder = {
levels = [
{
name = "Bronze"
rank = 1
color = "#c38b5f"
},
{
name = "Silver"
rank = 2
color = "#c3c3c3"
}
]
}
filter = {
category = "SERVICE"
query = "owners_is_set"
}
evaluation = {
window = 24
}
}`, t.ResourceType(), t.Tag, t.Name, t.Description)
}

/***********************************************************************************************************************
* Tests
**********************************************************************************************************************/
Expand Down Expand Up @@ -156,6 +196,36 @@ func TestAccScorecardResourceComplete(t *testing.T) {
resource.TestCheckResourceAttr(stub.ResourceFullName(), "evaluation.window", "24"),
),
},
// Read testing
{
Config: stub.ToTerraformWithoutDraft(),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr(stub.ResourceFullName(), "tag", stub.Tag),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "name", stub.Name),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "description", stub.Description),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "draft", "false"),

resource.TestCheckResourceAttr(stub.ResourceFullName(), "rules.0.title", "Has a Description"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "rules.0.expression", "description != null"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "rules.0.weight", "1"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "rules.0.level", "Bronze"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "rules.0.failure_message", "The description is required"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "rules.0.description", "The service has a description"),

resource.TestCheckResourceAttr(stub.ResourceFullName(), "ladder.levels.0.name", "Bronze"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "ladder.levels.0.rank", "1"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "ladder.levels.0.color", "#c38b5f"),

resource.TestCheckResourceAttr(stub.ResourceFullName(), "ladder.levels.1.name", "Silver"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "ladder.levels.1.rank", "2"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "ladder.levels.1.color", "#c3c3c3"),

resource.TestCheckResourceAttr(stub.ResourceFullName(), "filter.category", "SERVICE"),
resource.TestCheckResourceAttr(stub.ResourceFullName(), "filter.query", "owners_is_set"),

resource.TestCheckResourceAttr(stub.ResourceFullName(), "evaluation.window", "24"),
),
},
// ImportState testing
{
ResourceName: stub.ResourceFullName(),
Expand Down