From 3abe6a3b7a8e2d7ffe9f0549bf33871e5ec4524b Mon Sep 17 00:00:00 2001 From: Joonas Myhrberg Date: Wed, 5 Jul 2023 13:54:09 +0300 Subject: [PATCH 1/4] Replace hcl2 with hcl/v2 The github.com/hashicorp/hcl2 package was used temporarily for the development of HCL 2, and is now archived. This commit replaces with the API-compatible github.com/hashicorp/hcl/v2. As a result of this, the output of --tf12format will change slightly, with newlines added after every open bracket. --- go.mod | 4 +--- go.sum | 30 ++---------------------------- hcl_block.go | 2 +- hcl_writer.go | 2 +- hcl_writer_test.go | 2 +- main.go | 2 +- 6 files changed, 7 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index c2c9da4..70c2fc9 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f - github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80 + github.com/hashicorp/hcl/v2 v2.17.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1 github.com/hashicorp/terraform-provider-kubernetes v1.13.4-0.20230417041302-5de2ce8af29e github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 @@ -34,7 +34,6 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/agext/levenshtein v1.2.3 // indirect - github.com/apparentlymart/go-textseg v1.0.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -67,7 +66,6 @@ require ( github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hc-install v0.5.0 // indirect - github.com/hashicorp/hcl/v2 v2.15.0 // indirect github.com/hashicorp/logutils v1.0.0 // indirect github.com/hashicorp/terraform-exec v0.18.1 // indirect github.com/hashicorp/terraform-json v0.15.0 // indirect diff --git a/go.sum b/go.sum index 1274841..977f0a2 100644 --- a/go.sum +++ b/go.sum @@ -36,7 +36,6 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C6 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= -github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= @@ -55,7 +54,6 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bsm/go-vlq v0.0.0-20150828105119-ec6e8d4f5f4e/go.mod h1:N+BjUcTjSxc2mtRGSCPsat1kze3CUtvJN3/jTXlp29k= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -100,7 +98,6 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= @@ -123,7 +120,6 @@ github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= -github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= @@ -176,7 +172,6 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -190,7 +185,6 @@ github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUK github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I= github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= -github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= @@ -206,10 +200,8 @@ github.com/hashicorp/hc-install v0.5.0 h1:D9bl4KayIYKEeJ4vUDe9L5huqxZXczKaykSRcm github.com/hashicorp/hc-install v0.5.0/go.mod h1:JyzMfbzfSBSjoDCRPna1vi/24BEDxFaCPfdHtM5SCdo= github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws= github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= -github.com/hashicorp/hcl/v2 v2.15.0 h1:CPDXO6+uORPjKflkWCCwoWc9uRp+zSIPcCQ+BrxV7m8= -github.com/hashicorp/hcl/v2 v2.15.0/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= -github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80 h1:PFfGModn55JA0oBsvFghhj0v93me+Ctr3uHC/UmFAls= -github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80/go.mod h1:Cxv+IJLuBiEhQ7pBYGEuORa0nr4U994pE8mYLuFd7v0= +github.com/hashicorp/hcl/v2 v2.17.0 h1:z1XvSUyXd1HP10U4lrLg5e0JMVz6CPaJvAgxM0KNZVY= +github.com/hashicorp/hcl/v2 v2.17.0/go.mod h1:gJyW2PTShkJqQBKpAmPO3yxMxIuoXkOF2TpqXzrQyx4= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/terraform-exec v0.18.1 h1:LAbfDvNQU1l0NOQlTuudjczVhHj061fNX5H8XZxHlH4= @@ -230,7 +222,6 @@ github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKL github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 h1:VHgatEHNcBFEB7inlalqfNqw65aNkM1lGX2yt3NmbS8= @@ -244,7 +235,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= @@ -295,7 +285,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -319,9 +308,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -346,7 +332,6 @@ github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3V github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= @@ -358,7 +343,6 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= @@ -397,7 +381,6 @@ github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= @@ -409,7 +392,6 @@ go.starlark.net v0.0.0-20221205180719-3fd0dac74452 h1:JZtNuL6LPB+scU5yaQ6hqRlJFR go.starlark.net v0.0.0-20221205180719-3fd0dac74452/go.mod h1:kIVgS18CjmEC3PqMd5kaJSGEifyV/CeB9x506ZJ1Vbk= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -433,12 +415,10 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -470,10 +450,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -573,13 +551,10 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -595,7 +570,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= k8s.io/api v0.25.5 h1:mqyHf7aoaYMpdvO87mqpol+Qnsmo+y09S0PMIXwiZKo= k8s.io/api v0.25.5/go.mod h1:RzplZX0Z8rV/WhSTfEvnyd91bBhBQTRWo85qBQwRmb8= k8s.io/apimachinery v0.25.5 h1:SQomYHvv+aO43qdu3QKRf9YuI0oI8w3RrOQ1qPbAUGY= diff --git a/hcl_block.go b/hcl_block.go index 61eb90f..3b2b7c7 100644 --- a/hcl_block.go +++ b/hcl_block.go @@ -4,7 +4,7 @@ import ( "github.com/sl1pm4t/k2tf/pkg/tfkschema" "strings" - "github.com/hashicorp/hcl2/hclwrite" + "github.com/hashicorp/hcl/v2/hclwrite" log "github.com/sirupsen/logrus" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl_writer.go b/hcl_writer.go index 70e5e13..0415b88 100644 --- a/hcl_writer.go +++ b/hcl_writer.go @@ -13,7 +13,7 @@ import ( "github.com/rs/zerolog" - "github.com/hashicorp/hcl2/hclwrite" + "github.com/hashicorp/hcl/v2/hclwrite" "github.com/mitchellh/reflectwalk" "github.com/rs/zerolog/log" "github.com/zclconf/go-cty/cty" diff --git a/hcl_writer_test.go b/hcl_writer_test.go index 6bf5eae..1fd1231 100644 --- a/hcl_writer_test.go +++ b/hcl_writer_test.go @@ -9,7 +9,7 @@ import ( "github.com/sl1pm4t/k2tf/pkg/testutils" - "github.com/hashicorp/hcl2/hclwrite" + "github.com/hashicorp/hcl/v2/hclwrite" "github.com/stretchr/testify/assert" ) diff --git a/main.go b/main.go index c8af024..461c950 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/hashicorp/hcl/hcl/printer" - "github.com/hashicorp/hcl2/hclwrite" + "github.com/hashicorp/hcl/v2/hclwrite" "github.com/sl1pm4t/k2tf/pkg/file_io" "github.com/sl1pm4t/k2tf/pkg/tfkschema" flag "github.com/spf13/pflag" From 8dd10c8985f8415d8780c79ef82b3fabe3d724b7 Mon Sep 17 00:00:00 2001 From: Matt Morrison Date: Sat, 18 May 2024 19:54:50 +1200 Subject: [PATCH 2/4] rebase & go mod tidy --- go.sum | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.sum b/go.sum index 977f0a2..e5ccc48 100644 --- a/go.sum +++ b/go.sum @@ -42,10 +42,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= -github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFUye+ZcSR6opIgz9Co7WcDx6ZcY+RjfFHoA0I= github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= @@ -120,6 +118,7 @@ github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= @@ -310,7 +309,6 @@ github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= From b27266631fc1f1a33f2dcf7f262b16ecdc35e932 Mon Sep 17 00:00:00 2001 From: Matt Morrison Date: Sat, 18 May 2024 19:58:48 +1200 Subject: [PATCH 3/4] update golden files --- test-fixtures/basicDeployment.tf.golden | 28 +++++++++++++------ test-fixtures/clusterRole.tf.golden | 4 ++- test-fixtures/configMap.tf.golden | 10 +++++-- test-fixtures/daemonset.tf.golden | 20 +++++++++---- test-fixtures/deployment.tf.golden | 26 +++++++++++++---- test-fixtures/deployment2Containers.tf.golden | 8 ++++-- test-fixtures/endpoints.tf.golden | 8 ++++-- test-fixtures/issue-28.tf.golden | 17 ++++++++--- test-fixtures/issue-48.tf.golden | 4 ++- test-fixtures/namespace.tf.golden | 6 ++-- test-fixtures/networkPolicy.tf.golden | 4 ++- test-fixtures/podDisruptionBudget.tf.golden | 4 ++- test-fixtures/podNodeExporter.tf.golden | 12 ++++++-- test-fixtures/replicationController.tf.golden | 10 +++++-- test-fixtures/service.tf.golden | 10 +++++-- test-fixtures/statefulSet.tf.golden | 18 ++++++++---- test-fixtures/storageClass.tf.golden | 5 +++- 17 files changed, 144 insertions(+), 50 deletions(-) diff --git a/test-fixtures/basicDeployment.tf.golden b/test-fixtures/basicDeployment.tf.golden index 58ece0f..37abbba 100644 --- a/test-fixtures/basicDeployment.tf.golden +++ b/test-fixtures/basicDeployment.tf.golden @@ -1,18 +1,26 @@ resource "kubernetes_deployment" "baz_app" { metadata { - name = "baz-app" - namespace = "bat" - annotations = { foo = "fam" } + name = "baz-app" + namespace = "bat" + annotations = { + foo = "fam" + } } spec { replicas = 2 selector { - match_labels = { app = "nginx" } + match_labels = { + app = "nginx" + } } template { metadata { - labels = { app = "nginx" } - annotations = { foo = "fam" } + labels = { + app = "nginx" + } + annotations = { + foo = "fam" + } } spec { container { @@ -23,8 +31,12 @@ resource "kubernetes_deployment" "baz_app" { container_port = 80 } resources { - limits = { memory = "1Gi" } - requests = { cpu = "1" } + limits = { + memory = "1Gi" + } + requests = { + cpu = "1" + } } } } diff --git a/test-fixtures/clusterRole.tf.golden b/test-fixtures/clusterRole.tf.golden index fe5b45e..31a63cb 100644 --- a/test-fixtures/clusterRole.tf.golden +++ b/test-fixtures/clusterRole.tf.golden @@ -4,7 +4,9 @@ resource "kubernetes_cluster_role" "monitoring" { } aggregation_rule { cluster_role_selectors { - match_labels = { "rbac.example.com/aggregate-to-monitoring" = "true" } + match_labels = { + "rbac.example.com/aggregate-to-monitoring" = "true" + } } } } diff --git a/test-fixtures/configMap.tf.golden b/test-fixtures/configMap.tf.golden index 2763fb3..17dcba0 100644 --- a/test-fixtures/configMap.tf.golden +++ b/test-fixtures/configMap.tf.golden @@ -2,7 +2,13 @@ resource "kubernetes_config_map" "foo_config_map" { metadata { name = "foo-config-map" namespace = "bar" - labels = { lbl1 = "somevalue", lbl2 = "another" } + labels = { + lbl1 = "somevalue" + lbl2 = "another" + } + } + data = { + item1 = "wow" + item2 = "wee" } - data = { item1 = "wow", item2 = "wee" } } diff --git a/test-fixtures/daemonset.tf.golden b/test-fixtures/daemonset.tf.golden index 09c0880..1f5be77 100644 --- a/test-fixtures/daemonset.tf.golden +++ b/test-fixtures/daemonset.tf.golden @@ -2,23 +2,33 @@ resource "kubernetes_daemonset" "terraform_example" { metadata { name = "terraform-example" namespace = "something" - labels = { test = "MyExampleApp" } + labels = { + test = "MyExampleApp" + } } spec { selector { - match_labels = { test = "MyExampleApp" } + match_labels = { + test = "MyExampleApp" + } } template { metadata { - labels = { test = "MyExampleApp" } + labels = { + test = "MyExampleApp" + } } spec { container { name = "example" image = "nginx:1.7.8" resources { - limits = { memory = "512Mi" } - requests = { cpu = "250m" } + limits = { + memory = "512Mi" + } + requests = { + cpu = "250m" + } } } } diff --git a/test-fixtures/deployment.tf.golden b/test-fixtures/deployment.tf.golden index 6ef7388..fc8d615 100644 --- a/test-fixtures/deployment.tf.golden +++ b/test-fixtures/deployment.tf.golden @@ -2,17 +2,27 @@ resource "kubernetes_deployment" "backend_api" { metadata { name = "backend-api" namespace = "default" - labels = { app = "backend-api" } + labels = { + app = "backend-api" + } } spec { replicas = 4 selector { - match_labels = { app = "backend-api" } + match_labels = { + app = "backend-api" + } } template { metadata { - labels = { app = "backend-api" } - annotations = { "prometheus.io/port" = "8080", "prometheus.io/scheme" = "http", "prometheus.io/scrape" = "true" } + labels = { + app = "backend-api" + } + annotations = { + "prometheus.io/port" = "8080" + "prometheus.io/scheme" = "http" + "prometheus.io/scrape" = "true" + } } spec { volume { @@ -90,8 +100,12 @@ resource "kubernetes_deployment" "backend_api" { value = "bedba4b80a982b3116dfd56366de3c2d" } resources { - limits = { memory = "8Gi" } - requests = { cpu = "300m" } + limits = { + memory = "8Gi" + } + requests = { + cpu = "300m" + } } volume_mount { name = "backend-api-config" diff --git a/test-fixtures/deployment2Containers.tf.golden b/test-fixtures/deployment2Containers.tf.golden index 66f7dee..de96f5c 100644 --- a/test-fixtures/deployment2Containers.tf.golden +++ b/test-fixtures/deployment2Containers.tf.golden @@ -4,11 +4,15 @@ resource "kubernetes_deployment" "backend_api" { } spec { selector { - match_labels = { app = "backend-api" } + match_labels = { + app = "backend-api" + } } template { metadata { - labels = { app = "backend-api" } + labels = { + app = "backend-api" + } } spec { container { diff --git a/test-fixtures/endpoints.tf.golden b/test-fixtures/endpoints.tf.golden index 785f550..8bd0ef1 100644 --- a/test-fixtures/endpoints.tf.golden +++ b/test-fixtures/endpoints.tf.golden @@ -1,8 +1,10 @@ resource "kubernetes_endpoints" "backend" { metadata { - name = "backend" - namespace = "default" - annotations = { "alpha.istio.io/kubernetes-serviceaccounts" = "default" } + name = "backend" + namespace = "default" + annotations = { + "alpha.istio.io/kubernetes-serviceaccounts" = "default" + } } subset { address { diff --git a/test-fixtures/issue-28.tf.golden b/test-fixtures/issue-28.tf.golden index 4f4e83a..1cbc771 100644 --- a/test-fixtures/issue-28.tf.golden +++ b/test-fixtures/issue-28.tf.golden @@ -2,15 +2,22 @@ resource "kubernetes_daemonset" "nvidia_driver_installer" { metadata { name = "nvidia-driver-installer" namespace = "kube-system" - labels = { k8s-app = "nvidia-driver-installer" } + labels = { + k8s-app = "nvidia-driver-installer" + } } spec { selector { - match_labels = { k8s-app = "nvidia-driver-installer" } + match_labels = { + k8s-app = "nvidia-driver-installer" + } } template { metadata { - labels = { k8s-app = "nvidia-driver-installer", name = "nvidia-driver-installer" } + labels = { + k8s-app = "nvidia-driver-installer" + name = "nvidia-driver-installer" + } } spec { volume { @@ -75,7 +82,9 @@ resource "kubernetes_daemonset" "nvidia_driver_installer" { value = "/build/cos-tools" } resources { - requests = { cpu = "150m" } + requests = { + cpu = "150m" + } } volume_mount { name = "nvidia-install-dir-host" diff --git a/test-fixtures/issue-48.tf.golden b/test-fixtures/issue-48.tf.golden index 985a0fb..4660b30 100644 --- a/test-fixtures/issue-48.tf.golden +++ b/test-fixtures/issue-48.tf.golden @@ -7,7 +7,9 @@ resource "kubernetes_replication_controller" "echoheaders" { replicas = 1 template { metadata { - labels = { app = "echoheaders" } + labels = { + app = "echoheaders" + } } spec { container { diff --git a/test-fixtures/namespace.tf.golden b/test-fixtures/namespace.tf.golden index cb18244..e0c0ff2 100644 --- a/test-fixtures/namespace.tf.golden +++ b/test-fixtures/namespace.tf.golden @@ -1,6 +1,8 @@ resource "kubernetes_namespace" "cert_manager" { metadata { - name = "cert-manager" - labels = { "certmanager.k8s.io/disable-validation" = "true" } + name = "cert-manager" + labels = { + "certmanager.k8s.io/disable-validation" = "true" + } } } diff --git a/test-fixtures/networkPolicy.tf.golden b/test-fixtures/networkPolicy.tf.golden index 5552c97..333b2e6 100644 --- a/test-fixtures/networkPolicy.tf.golden +++ b/test-fixtures/networkPolicy.tf.golden @@ -4,7 +4,9 @@ resource "kubernetes_network_policy" "default_deny" { } spec { pod_selector { - match_labels = { IngressInternal = "active" } + match_labels = { + IngressInternal = "active" + } } ingress { ports { diff --git a/test-fixtures/podDisruptionBudget.tf.golden b/test-fixtures/podDisruptionBudget.tf.golden index f723f5f..9f7777c 100644 --- a/test-fixtures/podDisruptionBudget.tf.golden +++ b/test-fixtures/podDisruptionBudget.tf.golden @@ -5,7 +5,9 @@ resource "kubernetes_pod_disruption_budget" "test" { spec { min_available = "75%" selector { - match_labels = { app = "zookeeper" } + match_labels = { + app = "zookeeper" + } } } } diff --git a/test-fixtures/podNodeExporter.tf.golden b/test-fixtures/podNodeExporter.tf.golden index 2db96d6..4168e5f 100644 --- a/test-fixtures/podNodeExporter.tf.golden +++ b/test-fixtures/podNodeExporter.tf.golden @@ -3,8 +3,16 @@ resource "kubernetes_pod" "node_exporter_7fth_7" { name = "node-exporter-7fth7" generate_name = "node-exporter-" namespace = "prometheus" - labels = { controller-revision-hash = "2418008739", name = "node-exporter", pod-template-generation = "1" } - annotations = { "prometheus.io/port" = "9100", "prometheus.io/scheme" = "http", "prometheus.io/scrape" = "true" } + labels = { + controller-revision-hash = "2418008739" + name = "node-exporter" + pod-template-generation = "1" + } + annotations = { + "prometheus.io/port" = "9100" + "prometheus.io/scheme" = "http" + "prometheus.io/scrape" = "true" + } } spec { volume { diff --git a/test-fixtures/replicationController.tf.golden b/test-fixtures/replicationController.tf.golden index 3f406c6..cd6d972 100644 --- a/test-fixtures/replicationController.tf.golden +++ b/test-fixtures/replicationController.tf.golden @@ -1,13 +1,17 @@ resource "kubernetes_replication_controller" "es" { metadata { - name = "es" - labels = { component = "elasticsearch" } + name = "es" + labels = { + component = "elasticsearch" + } } spec { replicas = 1 template { metadata { - labels = { component = "elasticsearch" } + labels = { + component = "elasticsearch" + } } spec { volume { diff --git a/test-fixtures/service.tf.golden b/test-fixtures/service.tf.golden index ca6f693..7c72682 100644 --- a/test-fixtures/service.tf.golden +++ b/test-fixtures/service.tf.golden @@ -1,14 +1,18 @@ resource "kubernetes_service" "nginx" { metadata { - name = "nginx" - labels = { app = "nginx" } + name = "nginx" + labels = { + app = "nginx" + } } spec { port { name = "web" port = 80 } - selector = { app = "nginx" } + selector = { + app = "nginx" + } cluster_ip = "None" external_ips = ["192.168.10.2"] } diff --git a/test-fixtures/statefulSet.tf.golden b/test-fixtures/statefulSet.tf.golden index 33ede02..e6aee23 100644 --- a/test-fixtures/statefulSet.tf.golden +++ b/test-fixtures/statefulSet.tf.golden @@ -1,16 +1,22 @@ resource "kubernetes_stateful_set" "web" { metadata { - name = "web" - labels = { app = "nginx" } + name = "web" + labels = { + app = "nginx" + } } spec { replicas = 14 selector { - match_labels = { app = "nginx" } + match_labels = { + app = "nginx" + } } template { metadata { - labels = { app = "nginx" } + labels = { + app = "nginx" + } } spec { container { @@ -34,7 +40,9 @@ resource "kubernetes_stateful_set" "web" { spec { access_modes = ["ReadWriteOnce"] resources { - requests = { storage = "1Gi" } + requests = { + storage = "1Gi" + } } storage_class_name = "thin-disk" } diff --git a/test-fixtures/storageClass.tf.golden b/test-fixtures/storageClass.tf.golden index 6a79adf..425da0b 100644 --- a/test-fixtures/storageClass.tf.golden +++ b/test-fixtures/storageClass.tf.golden @@ -2,5 +2,8 @@ resource "kubernetes_storage_class" "slow" { metadata { name = "slow" } - parameters = { replication-type = "none", type = "pd-standard" } + parameters = { + replication-type = "none" + type = "pd-standard" + } } From 4d4ba1aade4eec018b4526da25b355b36e490678 Mon Sep 17 00:00:00 2001 From: Matt Morrison Date: Sat, 18 May 2024 20:02:23 +1200 Subject: [PATCH 4/4] more golden update --- test-fixtures/namespace_w_spec.tf.golden | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test-fixtures/namespace_w_spec.tf.golden b/test-fixtures/namespace_w_spec.tf.golden index cb18244..e0c0ff2 100644 --- a/test-fixtures/namespace_w_spec.tf.golden +++ b/test-fixtures/namespace_w_spec.tf.golden @@ -1,6 +1,8 @@ resource "kubernetes_namespace" "cert_manager" { metadata { - name = "cert-manager" - labels = { "certmanager.k8s.io/disable-validation" = "true" } + name = "cert-manager" + labels = { + "certmanager.k8s.io/disable-validation" = "true" + } } }