decoder: Update legacy tests for ObjectExpr

hashicorp · Mar 14, 2023 · fd9193b · fd9193b
1 parent 5acddf8
commit fd9193b
Show file tree

Hide file tree

Showing 3 changed files with 150 additions and 170 deletions.
diff --git a/decoder/expression_candidates_legacy_test.go b/decoder/expression_candidates_legacy_test.go
@@ -132,15 +132,13 @@ func TestLegacyDecoder_CandidateAtPos_expressions(t *testing.T) {
  "object as expression",
  map[string]*schema.AttributeSchema{
  "attr": {
- Expr: schema.ExprConstraints{
- schema.ObjectExpr{
- Attributes: schema.ObjectExprAttributes{
- "first": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.String),
- },
- "second": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.Number),
- },
+ Constraint: schema.Object{
+ Attributes: schema.ObjectAttributes{
+ "first": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.String},
+ },
+ "second": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.Number},
  },
  },
  },
@@ -179,15 +177,13 @@ func TestLegacyDecoder_CandidateAtPos_expressions(t *testing.T) {
  "object as expression - attribute",
  map[string]*schema.AttributeSchema{
  "attr": {
- Expr: schema.ExprConstraints{
- schema.ObjectExpr{
- Attributes: schema.ObjectExprAttributes{
- "first": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.String),
- },
- "second": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.Number),
- },
+ Constraint: schema.Object{
+ Attributes: schema.ObjectAttributes{
+ "first": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.String},
+ },
+ "second": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.Number},
  },
  },
  },
@@ -249,15 +245,13 @@ func TestLegacyDecoder_CandidateAtPos_expressions(t *testing.T) {
  "object as expression - attributes partially declared",
  map[string]*schema.AttributeSchema{
  "attr": {
- Expr: schema.ExprConstraints{
- schema.ObjectExpr{
- Attributes: schema.ObjectExprAttributes{
- "first": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.String),
- },
- "second": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.Number),
- },
+ Constraint: schema.Object{
+ Attributes: schema.ObjectAttributes{
+ "first": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.String},
+ },
+ "second": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.Number},
  },
  },
  },
@@ -298,15 +292,13 @@ func TestLegacyDecoder_CandidateAtPos_expressions(t *testing.T) {
  "object as expression - attribute key unknown",
  map[string]*schema.AttributeSchema{
  "attr": {
- Expr: schema.ExprConstraints{
- schema.ObjectExpr{
- Attributes: schema.ObjectExprAttributes{
- "first": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.String),
- },
- "second": &schema.AttributeSchema{
- Expr: schema.LiteralTypeOnly(cty.Number),
- },
+ Constraint: schema.Object{
+ Attributes: schema.ObjectAttributes{
+ "first": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.String},
+ },
+ "second": &schema.AttributeSchema{
+ Constraint: schema.LiteralType{Type: cty.Number},
  },
  },
  },