Skip to content

Commit e1e764a

Browse files
t0yv0t0yv0
committed
Reduce to 3116 types
1 parent ae15a65 commit e1e764a

File tree

10 files changed

+166
-41
lines changed

10 files changed

+166
-41
lines changed

‎provider/pkg/quicksight/quicksight.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package quicksight
22

33
import (
4+
"fmt"
5+
46
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
57
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
68
"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
@@ -138,7 +140,8 @@ type state struct {
138140
defined map[tokens.Type]struct{}
139141
}
140142

141-
func (st *state) define(tok tokens.Type, schema *info.Schema) *info.Schema {
143+
func (st *state) define(name string, schema *info.Schema) *info.Schema {
144+
tok := tokens.Type(fmt.Sprintf("aws:quicksight/%s:%s", name, name))
142145
copy := *schema
143146
if schema.Elem == nil {
144147
copy.Elem = &info.Schema{}
@@ -148,7 +151,7 @@ func (st *state) define(tok tokens.Type, schema *info.Schema) *info.Schema {
148151
}
149152
if _, ok := st.defined[tok]; !ok {
150153
st.defined[tok] = struct{}{}
151-
copy.Elem.TypePrefixOverride = tfbridge.StringRef("")
154+
copy.Elem.TypeName = tfbridge.Ref(name)
152155
return &copy
153156
}
154157
copy.Elem.Type = tok

‎provider/pkg/quicksight/template.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
)
66

77
func columnSchema(st *state) *info.Schema {
8-
return st.define("aws:quicksight/Column:Column", &info.Schema{})
8+
return st.define("Column", &info.Schema{})
99
}
1010

1111
func aggregationFunctionSchema(st *state) *info.Schema {
12-
return st.define("aws:quicksight/Aggregation:Aggregation", &info.Schema{
12+
return st.define("Aggregation", &info.Schema{
1313
Elem: &info.Schema{
1414
Fields: map[string]*info.Schema{
1515
"numerical_aggregation_function": numericalAggregationFunctionSchema(st),
@@ -19,5 +19,5 @@ func aggregationFunctionSchema(st *state) *info.Schema {
1919
}
2020

2121
func numericalAggregationFunctionSchema(st *state) *info.Schema {
22-
return st.define("aws:quicksight/NumericalAggregation:NumericalAggregation", &info.Schema{})
22+
return st.define("NumericalAggregation", &info.Schema{})
2323
}

‎provider/pkg/quicksight/template_format.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
func numericFormatConfigurationSchema(st *state) *info.Schema {
8-
return st.define("aws:quicksight/NumericFormatConfiguration:NumericFormatConfiguration", &info.Schema{
8+
return st.define("NumericFormatConfiguration", &info.Schema{
99
Elem: &info.Schema{
1010
Fields: map[string]*info.Schema{
1111
"currency_display_format_configuration": currencyDisplayFormatConfiguration(st),
@@ -17,7 +17,7 @@ func numericFormatConfigurationSchema(st *state) *info.Schema {
1717
}
1818

1919
func dateTimeFormatConfigurationSchema(st *state) *info.Schema {
20-
return st.define("aws:quicksight/DateTimeFormatConfiguration:DateTimeFormatConfiguration", &info.Schema{
20+
return st.define("DateTimeFormatConfiguration", &info.Schema{
2121
Elem: &info.Schema{
2222
Fields: map[string]*info.Schema{
2323
"null_value_format_configuration": nullValueConfigurationSchema(st),
@@ -27,7 +27,7 @@ func dateTimeFormatConfigurationSchema(st *state) *info.Schema {
2727
}
2828

2929
func numberDisplayFormatConfigurationSchema(st *state) *info.Schema {
30-
return st.define("aws:quicksight/NumberDisplayFormatConfiguration:NumberDisplayFormatConfiguration",
30+
return st.define("NumberDisplayFormatConfiguration",
3131
&info.Schema{
3232
Elem: &info.Schema{
3333
Fields: map[string]*info.Schema{
@@ -41,7 +41,7 @@ func numberDisplayFormatConfigurationSchema(st *state) *info.Schema {
4141
}
4242

4343
func percentageDisplayFormatConfiguration(st *state) *info.Schema {
44-
return st.define("aws:quicksight/PercentageDisplayFormatConfiguration:PercentageDisplayFormatConfiguration",
44+
return st.define("PercentageDisplayFormatConfiguration",
4545
&info.Schema{
4646
Elem: &info.Schema{
4747
Fields: map[string]*info.Schema{
@@ -52,7 +52,7 @@ func percentageDisplayFormatConfiguration(st *state) *info.Schema {
5252
}
5353

5454
func numberFormatConfigurationSchema(st *state) *info.Schema {
55-
return st.define("aws:quicksight/NumberFormatConfiguration:NumberFormatConfiguration", &info.Schema{
55+
return st.define("NumberFormatConfiguration", &info.Schema{
5656
Elem: &info.Schema{
5757
Fields: map[string]*info.Schema{
5858
"numeric_format_configuration": numericFormatConfigurationSchema(st),
@@ -62,7 +62,7 @@ func numberFormatConfigurationSchema(st *state) *info.Schema {
6262
}
6363

6464
func stringFormatConfigurationSchema(st *state) *info.Schema {
65-
return st.define("aws:quicksight/StringFormatConfiguration:StringFormatConfiguration", &info.Schema{
65+
return st.define("StringFormatConfiguration", &info.Schema{
6666
Elem: &info.Schema{
6767
Fields: map[string]*info.Schema{
6868
"null_value_format_configuration": nullValueConfigurationSchema(st),
@@ -72,11 +72,11 @@ func stringFormatConfigurationSchema(st *state) *info.Schema {
7272
}
7373

7474
func nullValueConfigurationSchema(st *state) *info.Schema {
75-
return st.define("aws:quicksight/NullValueFormatConfiguration:NullValueFormatConfiguration", &info.Schema{})
75+
return st.define("NullValueFormatConfiguration", &info.Schema{})
7676
}
7777

7878
func formatConfigurationSchema(st *state) *info.Schema {
79-
return st.define("aws:quicksight/FormatConfiguration:FormatConfiguration", &info.Schema{
79+
return st.define("FormatConfiguration", &info.Schema{
8080
Elem: &info.Schema{
8181
Fields: map[string]*info.Schema{
8282
"date_time_format_configuration": dateTimeFormatConfigurationSchema(st),
@@ -88,7 +88,7 @@ func formatConfigurationSchema(st *state) *info.Schema {
8888
}
8989

9090
func currencyDisplayFormatConfiguration(st *state) *info.Schema {
91-
return st.define("aws:quicksight/CurrencyDisplayFormatConfiguration:CurrencyDisplayFormatConfiguration",
91+
return st.define("CurrencyDisplayFormatConfiguration",
9292
&info.Schema{
9393
Elem: &info.Schema{
9494
Fields: map[string]*info.Schema{

‎provider/pkg/quicksight/template_sheet.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import (
55
)
66

77
func analysisDefaultSchema(st *state) *info.Schema {
8-
return st.define("aws:quicksight/AnalysisDefaults:AnalysisDefaults", &info.Schema{})
8+
return st.define("AnalysisDefaults", &info.Schema{})
99
}

‎provider/pkg/quicksight/visual.go‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
// Field Wells replicate a lot.
88
func visualsSchema(st *state) *info.Schema {
9-
return st.define("aws:quicksight/Visual:Visual", &info.Schema{
9+
return st.define("Visual", &info.Schema{
1010
Elem: &info.Schema{
1111
Fields: map[string]*info.Schema{
1212
"bar_chart_visual": barCharVisualSchema(st),
@@ -222,14 +222,6 @@ func histogramVisualSchema(st *state) *info.Schema {
222222
}
223223
}
224224

225-
func insightVisualSchema(*state) *info.Schema {
226-
return &info.Schema{
227-
Elem: &info.Schema{
228-
Fields: map[string]*info.Schema{},
229-
},
230-
}
231-
}
232-
233225
func kpiVisualSchema(st *state) *info.Schema {
234226
fieldWells := &info.Schema{
235227
Elem: &info.Schema{
@@ -452,6 +444,15 @@ func scatterPlotVisualSchema(st *state) *info.Schema {
452444
},
453445
},
454446
},
447+
"scatter_plot_unaggregated_field_wells": {
448+
Elem: &info.Schema{
449+
Fields: map[string]*info.Schema{
450+
"size": measureFieldSchema(st, 200),
451+
"x_axis": dimensionFieldSchema(st, 200),
452+
"y_axis": dimensionFieldSchema(st, 200),
453+
},
454+
},
455+
},
455456
},
456457
},
457458
}
@@ -488,6 +489,20 @@ func tableVisualSchema(st *state) *info.Schema {
488489
},
489490
},
490491
},
492+
"table_unaggregated_field_wells": {
493+
Elem: &info.Schema{
494+
Fields: map[string]*info.Schema{
495+
"values": {
496+
Elem: &info.Schema{
497+
Fields: map[string]*info.Schema{
498+
"column": columnSchema(st),
499+
"format_configuration": formatConfigurationSchema(st),
500+
},
501+
},
502+
},
503+
},
504+
},
505+
},
491506
},
492507
},
493508
}
@@ -630,7 +645,7 @@ func wordCloudVisualSchema(st *state) *info.Schema {
630645
}
631646

632647
func legendOptionsSchema(st *state) *info.Schema {
633-
return st.define("aws:quicksight/LegendOptions:LegendOptions", &info.Schema{})
648+
return st.define("LegendOptions", &info.Schema{})
634649
}
635650

636651
func tooltipOptionsSchema(st *state) *info.Schema {
@@ -648,7 +663,7 @@ func tooltipOptionsSchema(st *state) *info.Schema {
648663
},
649664
},
650665
}
651-
return st.define("aws:quicksight/TooltipOptions:TooltipOptions", &info.Schema{
666+
return st.define("TooltipOptions", &info.Schema{
652667
Elem: &info.Schema{
653668
Fields: map[string]*info.Schema{
654669
"field_base_tooltip": {
@@ -664,11 +679,11 @@ func tooltipOptionsSchema(st *state) *info.Schema {
664679
}
665680

666681
func visualPaletteSchema(st *state) *info.Schema {
667-
return st.define("aws:quicksight/VisualPalette:VisualPalette", &info.Schema{})
682+
return st.define("VisualPalette", &info.Schema{})
668683
}
669684

670685
func dataLabelOptionsSchema(st *state) *info.Schema {
671-
return st.define("aws:quicksight/DataLabelOptions:DataLabelOptions", &info.Schema{
686+
return st.define("DataLabelOptions", &info.Schema{
672687
Elem: &info.Schema{
673688
Fields: map[string]*info.Schema{
674689
"label_font_configuration": fontConfigurationSchema(st),
@@ -678,5 +693,5 @@ func dataLabelOptionsSchema(st *state) *info.Schema {
678693
}
679694

680695
func fontConfigurationSchema(st *state) *info.Schema {
681-
return st.define("aws:quicksight/FontConfiguration:FontConfiguration", &info.Schema{})
696+
return st.define("FontConfiguration", &info.Schema{})
682697
}

‎provider/pkg/quicksight/visual_actions.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import (
55
)
66

77
func visualCustomActionsSchema(st *state) *info.Schema {
8-
return st.define("aws:quicksight/Actions:Actions", &info.Schema{})
8+
return st.define("Actions", &info.Schema{})
99
}

‎provider/pkg/quicksight/visual_chart_configuration.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ import (
55
)
66

77
func axisDisplayOptionsSchema(st *state) *info.Schema {
8-
return st.define("aws:quicksight/AxisDisplayOptions:AxisDisplayOptions",
9-
&info.Schema{})
8+
return st.define("AxisDisplayOptions", &info.Schema{})
109
}
1110

1211
func chartAxisLabelOptionsSchema(st *state) *info.Schema {
13-
return st.define("aws:quicksight/AxisLabelOptions:AxisLabelOptions",
14-
&info.Schema{})
12+
return st.define("AxisLabelOptions", &info.Schema{})
1513
}
1614

1715
func referenceLineSchema(st *state) *info.Schema {
@@ -44,7 +42,7 @@ func referenceLineSchema(st *state) *info.Schema {
4442
},
4543
},
4644
}
47-
return st.define("aws:quicksight/ReferenceLineSchema:ReferenceLineSchema", &info.Schema{
45+
return st.define("ReferenceLineSchema", &info.Schema{
4846
Elem: &info.Schema{
4947
Fields: map[string]*info.Schema{
5048
"data_configuration": dataConf,
@@ -55,5 +53,5 @@ func referenceLineSchema(st *state) *info.Schema {
5553
}
5654

5755
func contributionAnalysisDefaultsSchema(st *state) *info.Schema {
58-
return st.define("aws:quicksight/ContributionAnalysisDefaults:ContributionAnalysisDefaults", &info.Schema{})
56+
return st.define("ContributionAnalysisDefaults", &info.Schema{})
5957
}

‎provider/pkg/quicksight/visual_fields.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
// This needs a type name hint, since DimensionField does not work.
88
func dimensionFieldSchema(st *state, maxItems int) *info.Schema {
9-
return st.define("aws:quicksight/DimensionField:DimensionField", &info.Schema{
9+
return st.define("DimensionField", &info.Schema{
1010
Elem: &info.Schema{
1111
Fields: map[string]*info.Schema{
1212
"categorical_dimension_field": {
@@ -39,7 +39,7 @@ func dimensionFieldSchema(st *state, maxItems int) *info.Schema {
3939
}
4040

4141
func measureFieldSchema(st *state, maxItems int) *info.Schema {
42-
return st.define("aws:quicksight/MeasureFieldSchema:MeasureFieldSchema", &info.Schema{
42+
return st.define("MeasureFieldSchema", &info.Schema{
4343
Elem: &info.Schema{
4444
Fields: map[string]*info.Schema{
4545
"calculated_measure_field": {

‎provider/pkg/quicksight/visual_insight.go‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
package quicksight
2+
3+
import (
4+
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
5+
)
6+
7+
func insightVisualSchema(st *state) *info.Schema {
8+
return &info.Schema{
9+
Elem: &info.Schema{
10+
Fields: map[string]*info.Schema{
11+
"actions": visualCustomActionsSchema(st),
12+
"insight_configuration": {
13+
Elem: &info.Schema{
14+
Fields: map[string]*info.Schema{
15+
"computation": {
16+
Elem: &info.Schema{
17+
Fields: map[string]*info.Schema{
18+
"forecast": {
19+
Elem: &info.Schema{
20+
Fields: map[string]*info.Schema{
21+
"time": dimensionFieldSchema(st, 1),
22+
"value": measureFieldSchema(st, 1),
23+
},
24+
},
25+
},
26+
"growth_rate": {
27+
Elem: &info.Schema{
28+
Fields: map[string]*info.Schema{
29+
"time": dimensionFieldSchema(st, 1),
30+
"value": measureFieldSchema(st, 1),
31+
},
32+
},
33+
},
34+
"maximum_minimum": {
35+
Elem: &info.Schema{
36+
Fields: map[string]*info.Schema{
37+
"time": dimensionFieldSchema(st, 1),
38+
"value": measureFieldSchema(st, 1),
39+
},
40+
},
41+
},
42+
"metric_comparison": {
43+
Elem: &info.Schema{
44+
Fields: map[string]*info.Schema{
45+
"time": dimensionFieldSchema(st, 1),
46+
"from_value": measureFieldSchema(st, 1),
47+
"target_value": measureFieldSchema(st, 1),
48+
},
49+
},
50+
},
51+
"period_over_period": {
52+
Elem: &info.Schema{
53+
Fields: map[string]*info.Schema{
54+
"time": dimensionFieldSchema(st, 1),
55+
"value": measureFieldSchema(st, 1),
56+
},
57+
},
58+
},
59+
"period_to_date": {
60+
Elem: &info.Schema{
61+
Fields: map[string]*info.Schema{
62+
"time": dimensionFieldSchema(st, 1),
63+
"value": measureFieldSchema(st, 1),
64+
},
65+
},
66+
},
67+
"top_bottom_movers": {
68+
Elem: &info.Schema{
69+
Fields: map[string]*info.Schema{
70+
"category": dimensionFieldSchema(st, 1),
71+
"time": dimensionFieldSchema(st, 1),
72+
"value": measureFieldSchema(st, 1),
73+
},
74+
},
75+
},
76+
"top_bottom_ranked": {
77+
Elem: &info.Schema{
78+
Fields: map[string]*info.Schema{
79+
"category": dimensionFieldSchema(st, 1),
80+
"value": measureFieldSchema(st, 1),
81+
},
82+
},
83+
},
84+
"total_aggregation": {
85+
Elem: &info.Schema{
86+
Fields: map[string]*info.Schema{
87+
"value": measureFieldSchema(st, 1),
88+
},
89+
},
90+
},
91+
"unique_values": {
92+
Elem: &info.Schema{
93+
Fields: map[string]*info.Schema{
94+
"category": dimensionFieldSchema(st, 1),
95+
},
96+
},
97+
},
98+
},
99+
},
100+
},
101+
},
102+
},
103+
},
104+
// "subtitle": visualSubtitleLabelOptionsSchema(st),
105+
// "title": visualTitleLabelOptionsSchema(st),
106+
},
107+
},
108+
}
109+
}

0 commit comments

Comments
 (0)