@@ -11,11 +11,12 @@ import (
1111 "os"
1212 "path"
1313
14- "github.com/hashicorp/terraform-plugin-framework-validators/schemavalidator"
14+ "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
15+ "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
1516 "github.com/hashicorp/terraform-plugin-framework/datasource"
16- "github.com/hashicorp/terraform-plugin-framework/diag "
17+ "github.com/hashicorp/terraform-plugin-framework/datasource/schema "
1718 fwpath "github.com/hashicorp/terraform-plugin-framework/path"
18- "github.com/hashicorp/terraform-plugin-framework/tfsdk "
19+ "github.com/hashicorp/terraform-plugin-framework/schema/validator "
1920 "github.com/hashicorp/terraform-plugin-framework/types"
2021)
2122
@@ -27,140 +28,125 @@ func NewArchiveFileDataSource() datasource.DataSource {
2728
2829type archiveFileDataSource struct {}
2930
30- func (d * archiveFileDataSource ) GetSchema (ctx context.Context ) (tfsdk. Schema , diag. Diagnostics ) {
31- return tfsdk .Schema {
31+ func (d * archiveFileDataSource ) Schema (ctx context.Context , req datasource. SchemaRequest , resp * datasource. SchemaResponse ) {
32+ resp . Schema = schema .Schema {
3233 Description : "Generates an archive from content, a file, or directory of files." ,
33- Blocks : map [string ]tfsdk .Block {
34- "source" : {
34+ Blocks : map [string ]schema .Block {
35+ "source" : schema. SetNestedBlock {
3536 Description : "Specifies attributes of a single source file to include into the archive." ,
36- Attributes : map [string ]tfsdk.Attribute {
37- "content" : {
38- Description : "Add this content to the archive with `filename` as the filename." ,
39- Type : types .StringType ,
40- Required : true ,
41- Validators : []tfsdk.AttributeValidator {
42- schemavalidator .ConflictsWith (
43- fwpath .MatchRoot ("source_file" ),
44- fwpath .MatchRoot ("source_dir" ),
45- fwpath .MatchRoot ("source_content" ),
46- fwpath .MatchRoot ("source_content_filename" ),
47- ),
37+ NestedObject : schema.NestedBlockObject {
38+ Attributes : map [string ]schema.Attribute {
39+ "content" : schema.StringAttribute {
40+ Description : "Add this content to the archive with `filename` as the filename." ,
41+ Required : true ,
42+ Validators : []validator.String {
43+ stringvalidator .ConflictsWith (
44+ fwpath .MatchRoot ("source_file" ),
45+ fwpath .MatchRoot ("source_dir" ),
46+ fwpath .MatchRoot ("source_content" ),
47+ fwpath .MatchRoot ("source_content_filename" ),
48+ ),
49+ },
50+ },
51+ "filename" : schema.StringAttribute {
52+ Description : "Set this as the filename when declaring a `source`." ,
53+ Required : true ,
4854 },
49- },
50- "filename" : {
51- Description : "Set this as the filename when declaring a `source`." ,
52- Type : types .StringType ,
53- Required : true ,
5455 },
5556 },
56- NestingMode : tfsdk .BlockNestingModeSet ,
5757 },
5858 },
59- Attributes : map [string ]tfsdk .Attribute {
60- "id" : {
59+ Attributes : map [string ]schema .Attribute {
60+ "id" : schema. StringAttribute {
6161 Description : "The sha1 checksum hash of the output." ,
62- Type : types .StringType ,
6362 Computed : true ,
6463 },
65- "type" : {
64+ "type" : schema. StringAttribute {
6665 Description : "The type of archive to generate. NOTE: `zip` is supported." ,
67- Type : types .StringType ,
6866 Required : true ,
6967 },
70- "source_content" : {
68+ "source_content" : schema. StringAttribute {
7169 Description : "Add only this content to the archive with `source_content_filename` as the filename." ,
72- Type : types .StringType ,
7370 Optional : true ,
74- Validators : []tfsdk. AttributeValidator {
75- schemavalidator .ConflictsWith (
71+ Validators : []validator. String {
72+ stringvalidator .ConflictsWith (
7673 fwpath .MatchRoot ("source_file" ),
7774 fwpath .MatchRoot ("source_dir" ),
7875 ),
7976 },
8077 },
81- "source_content_filename" : {
78+ "source_content_filename" : schema. StringAttribute {
8279 Description : "Set this as the filename when using `source_content`." ,
83- Type : types .StringType ,
8480 Optional : true ,
85- Validators : []tfsdk. AttributeValidator {
86- schemavalidator .ConflictsWith (
81+ Validators : []validator. String {
82+ stringvalidator .ConflictsWith (
8783 fwpath .MatchRoot ("source_file" ),
8884 fwpath .MatchRoot ("source_dir" ),
8985 ),
9086 },
9187 },
92- "source_file" : {
88+ "source_file" : schema. StringAttribute {
9389 Description : "Package this file into the archive." ,
94- Type : types .StringType ,
9590 Optional : true ,
96- Validators : []tfsdk. AttributeValidator {
97- schemavalidator .ConflictsWith (
91+ Validators : []validator. String {
92+ stringvalidator .ConflictsWith (
9893 fwpath .MatchRoot ("source_dir" ),
9994 fwpath .MatchRoot ("source_content" ),
10095 fwpath .MatchRoot ("source_content_filename" ),
10196 ),
10297 },
10398 },
104- "source_dir" : {
99+ "source_dir" : schema. StringAttribute {
105100 Description : "Package entire contents of this directory into the archive." ,
106- Type : types .StringType ,
107101 Optional : true ,
108- Validators : []tfsdk. AttributeValidator {
109- schemavalidator .ConflictsWith (
102+ Validators : []validator. String {
103+ stringvalidator .ConflictsWith (
110104 fwpath .MatchRoot ("source_file" ),
111105 fwpath .MatchRoot ("source_content" ),
112106 fwpath .MatchRoot ("source_content_filename" ),
113107 ),
114108 },
115109 },
116- "excludes" : {
110+ "excludes" : schema. SetAttribute {
117111 Description : "Specify files to ignore when reading the `source_dir`." ,
118- Type : types.SetType {
119- ElemType : types .StringType ,
120- },
121- Optional : true ,
122- Validators : []tfsdk.AttributeValidator {
123- schemavalidator .ConflictsWith (
112+ ElementType : types .StringType ,
113+ Optional : true ,
114+ Validators : []validator.Set {
115+ setvalidator .ConflictsWith (
124116 fwpath .MatchRoot ("source_file" ),
125117 fwpath .MatchRoot ("source_content" ),
126118 fwpath .MatchRoot ("source_content_filename" ),
127119 ),
128120 },
129121 },
130- "output_path" : {
122+ "output_path" : schema. StringAttribute {
131123 Description : "The output of the archive file." ,
132- Type : types .StringType ,
133124 Required : true ,
134125 },
135- "output_size" : {
126+ "output_size" : schema. Int64Attribute {
136127 Description : "The byte size of the output archive file." ,
137- Type : types .Int64Type ,
138128 Computed : true ,
139129 },
140- "output_sha" : {
130+ "output_sha" : schema. StringAttribute {
141131 Description : "The SHA1 checksum of output archive file." ,
142- Type : types .StringType ,
143132 Computed : true ,
144133 },
145- "output_base64sha256" : {
134+ "output_base64sha256" : schema. StringAttribute {
146135 Description : "The base64-encoded SHA256 checksum of output archive file." ,
147- Type : types .StringType ,
148136 Computed : true ,
149137 },
150- "output_md5" : {
138+ "output_md5" : schema. StringAttribute {
151139 Description : "The MD5 checksum of output archive file." ,
152- Type : types .StringType ,
153140 Computed : true ,
154141 },
155- "output_file_mode" : {
142+ "output_file_mode" : schema. StringAttribute {
156143 Description : "String that specifies the octal file mode for all archived files. For example: `\" 0666\" `. " +
157144 "Setting this will ensure that cross platform usage of this module will not vary the modes of archived " +
158145 "files (and ultimately checksums) resulting in more deterministic behavior." ,
159- Type : types .StringType ,
160146 Optional : true ,
161147 },
162148 },
163- }, nil
149+ }
164150}
165151
166152func archive (ctx context.Context , model fileModel ) error {
0 commit comments