diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a15414..fa51066 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,8 @@ on: branches: - main pull_request: + branches: + - main name: Test jobs: @@ -19,3 +21,9 @@ jobs: run: npm install - name: Run Test run: make test + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v2 + with: + format: golang + file: coverage/cover.out + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 87d3054..a4dd01f 100644 --- a/README.md +++ b/README.md @@ -39,13 +39,13 @@ You will need to install golang to use this tool. Learn more at [go.dev](https:/ Once go is installed, you can install the `htmlassets` tool with: ```bash -go install github.com/gauntface/go-html-asset-manager/v4/cmds/htmlassets@latest +go install github.com/gauntface/go-html-asset-manager/v5/cmds/htmlassets@latest ``` If you'd like to generate image sizes, you can install the `genimgs` tool with: ```bash -go install github.com/gauntface/go-html-asset-manager/v4/cmds/genimgs@latest +go install github.com/gauntface/go-html-asset-manager/v5/cmds/genimgs@latest ``` ## Usage diff --git a/assets/assetid/assetid.go b/assets/assetid/assetid.go index 70753db..18f859e 100644 --- a/assets/assetid/assetid.go +++ b/assets/assetid/assetid.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/gauntface/go-html-asset-manager/v4/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets" ) const ( diff --git a/assets/assetid/assetid_test.go b/assets/assetid/assetid_test.go index a000086..6ea2ece 100644 --- a/assets/assetid/assetid_test.go +++ b/assets/assetid/assetid_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/gauntface/go-html-asset-manager/v4/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets" "github.com/google/go-cmp/cmp" ) diff --git a/assets/assetmanager/assetmanager.go b/assets/assetmanager/assetmanager.go index 42c2e05..7b829e3 100644 --- a/assets/assetmanager/assetmanager.go +++ b/assets/assetmanager/assetmanager.go @@ -25,10 +25,11 @@ import ( "sort" "strings" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetid" - "github.com/gauntface/go-html-asset-manager/v4/utils/files" - "github.com/gauntface/go-html-asset-manager/v4/utils/stringui" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetid" + "github.com/gauntface/go-html-asset-manager/v5/utils/files" + "github.com/gauntface/go-html-asset-manager/v5/utils/stringui" + "golang.org/x/net/html" ) var ( @@ -306,7 +307,10 @@ func (l *LocalAsset) URL() (string, error) { } return path.Join("/", relPath), nil +} +func (l *LocalAsset) Attributes() []html.Attribute { + return nil } func (l *LocalAsset) IsLocal() bool { @@ -325,16 +329,18 @@ func (l *LocalAsset) String() string { } type RemoteAsset struct { - id string - url string - assetType assets.Type + id string + url string + attributes []html.Attribute + assetType assets.Type } -func NewRemoteAsset(ID, url string, ty assets.Type) *RemoteAsset { +func NewRemoteAsset(ID, src string, attributes []html.Attribute, ty assets.Type) *RemoteAsset { return &RemoteAsset{ - id: ID, - url: url, - assetType: ty, + id: ID, + url: src, + attributes: attributes, + assetType: ty, } } @@ -354,6 +360,10 @@ func (r *RemoteAsset) URL() (string, error) { return r.url, nil } +func (r *RemoteAsset) Attributes() []html.Attribute { + return r.attributes +} + func (r *RemoteAsset) Contents() (string, error) { return "", fmt.Errorf("%w for %q", errNoContents, r.url) } @@ -363,7 +373,11 @@ func (r *RemoteAsset) IsLocal() bool { } func (r *RemoteAsset) String() string { - return fmt.Sprintf("", r.url) + attrs := []string{} + for _, a := range r.attributes { + attrs = append(attrs, fmt.Sprintf("%v=%q", a.Key, a.Val)) + } + return fmt.Sprintf("", r.url, strings.Join(attrs, ", ")) } func (r *RemoteAsset) Debug(d string) bool { @@ -397,6 +411,7 @@ type Asset interface { Media() string URL() (string, error) Contents() (string, error) + Attributes() []html.Attribute IsLocal() bool String() string Debug(d string) bool diff --git a/assets/assetmanager/assetmanager_test.go b/assets/assetmanager/assetmanager_test.go index c2572af..7cc5c7b 100644 --- a/assets/assetmanager/assetmanager_test.go +++ b/assets/assetmanager/assetmanager_test.go @@ -24,9 +24,10 @@ import ( "reflect" "testing" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetid" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetid" "github.com/google/go-cmp/cmp" + "golang.org/x/net/html" ) var errInjected = errors.New("injected error") @@ -1096,6 +1097,7 @@ func TestNewRemoteAsset(t *testing.T) { description string id string url string + attributes []html.Attribute assetType assets.Type want *RemoteAsset }{ @@ -1103,10 +1105,30 @@ func TestNewRemoteAsset(t *testing.T) { description: "return new remote asset", id: "example-id", url: "http://example.com/example.css", - assetType: assets.InlineCSS, + attributes: []html.Attribute{ + { + Key: "example", + Val: "test", + }, + { + Key: "example-2", + Val: "another test", + }, + }, + assetType: assets.InlineCSS, want: &RemoteAsset{ - id: "example-id", - url: "http://example.com/example.css", + id: "example-id", + url: "http://example.com/example.css", + attributes: []html.Attribute{ + { + Key: "example", + Val: "test", + }, + { + Key: "example-2", + Val: "another test", + }, + }, assetType: assets.InlineCSS, }, }, @@ -1114,7 +1136,7 @@ func TestNewRemoteAsset(t *testing.T) { for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - got := NewRemoteAsset(tt.id, tt.url, tt.assetType) + got := NewRemoteAsset(tt.id, tt.url, tt.attributes, tt.assetType) opts := []cmp.Option{ cmp.AllowUnexported(RemoteAsset{}), } @@ -1180,7 +1202,7 @@ func TestRemoteAsset_String(t *testing.T) { asset: &RemoteAsset{ url: "http://example.com/url.html", }, - want: ``, + want: ``, }, } diff --git a/assets/assetstubs/assetsstubs.go b/assets/assetstubs/assetsstubs.go index 1e73f56..a9e7909 100644 --- a/assets/assetstubs/assetsstubs.go +++ b/assets/assetstubs/assetsstubs.go @@ -19,8 +19,9 @@ package assetstubs import ( "testing" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "golang.org/x/net/html" ) type Manager struct { @@ -64,6 +65,8 @@ type Asset struct { URLReturn string URLError error + AttributesReturn []html.Attribute + ContentsReturn string ContentsError error @@ -92,6 +95,10 @@ func (a *Asset) URL() (string, error) { return a.URLReturn, a.URLError } +func (a *Asset) Attributes() []html.Attribute { + return a.AttributesReturn +} + func (a *Asset) Contents() (string, error) { return a.ContentsReturn, a.ContentsError } diff --git a/assets/genimgs/genimgs.go b/assets/genimgs/genimgs.go index 9328503..60edee3 100644 --- a/assets/genimgs/genimgs.go +++ b/assets/genimgs/genimgs.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" awstypes "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/disintegration/imaging" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/files" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/files" ) var ( diff --git a/cmds/genimgs/genimgs.go b/cmds/genimgs/genimgs.go index fc46d3b..bb9cb29 100644 --- a/cmds/genimgs/genimgs.go +++ b/cmds/genimgs/genimgs.go @@ -38,11 +38,11 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/chai2010/webp" "github.com/disintegration/imaging" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/files" - "github.com/gauntface/go-html-asset-manager/v4/utils/sets" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/files" + "github.com/gauntface/go-html-asset-manager/v5/utils/sets" "github.com/mitchellh/go-homedir" "github.com/schollz/progressbar/v3" ) diff --git a/cmds/htmlassets/htmlassets.go b/cmds/htmlassets/htmlassets.go index 88c9170..b635175 100644 --- a/cmds/htmlassets/htmlassets.go +++ b/cmds/htmlassets/htmlassets.go @@ -32,27 +32,27 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/asyncsrc" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/iframedefaultsize" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/imgsize" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/imgtopicture" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/injectassets" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/lazyload" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/opengraphimg" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/ratiowrapper" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/stripassets" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/vimeoclean" - "github.com/gauntface/go-html-asset-manager/v4/manipulations/youtubeclean" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors/hamassets" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors/jsonassets" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors/revisionassets" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlencoding" - "github.com/gauntface/go-html-asset-manager/v4/utils/vimeoapi" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/asyncsrc" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/iframedefaultsize" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/imgsize" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/imgtopicture" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/injectassets" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/lazyload" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/opengraphimg" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/ratiowrapper" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/stripassets" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/vimeoclean" + "github.com/gauntface/go-html-asset-manager/v5/manipulations/youtubeclean" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors/hamassets" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors/jsonassets" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors/revisionassets" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlencoding" + "github.com/gauntface/go-html-asset-manager/v5/utils/vimeoapi" "github.com/mitchellh/go-homedir" "github.com/schollz/progressbar/v3" "golang.org/x/net/html" diff --git a/cmds/htmlassets/htmlassets_test.go b/cmds/htmlassets/htmlassets_test.go index 4840e03..a7ee8a7 100644 --- a/cmds/htmlassets/htmlassets_test.go +++ b/cmds/htmlassets/htmlassets_test.go @@ -27,12 +27,12 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetstubs" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetstubs" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/mitchellh/go-homedir" @@ -324,9 +324,9 @@ func Test_manipulations(t *testing.T) { description: "return errors if processing file fails", manager: &assetstubs.Manager{ WithTypeReturn: map[assets.Type][]assetmanager.Asset{ - assets.HTML: []assetmanager.Asset{ + assets.HTML: { assetstubs.MustNewLocalAsset(t, "/example/", "/example/example-1.html"), - assetmanager.NewRemoteAsset("example", "http://example.com/123", assets.Unknown), + assetmanager.NewRemoteAsset("example", "http://example.com/123", []html.Attribute{}, assets.Unknown), }, }, }, diff --git a/embedassets/assets/js/components/n-ham-c-lite-vi-async.js b/embedassets/assets/js/components/n-ham-c-lite-vi-async.js index b0612a5..766c817 100644 --- a/embedassets/assets/js/components/n-ham-c-lite-vi-async.js +++ b/embedassets/assets/js/components/n-ham-c-lite-vi-async.js @@ -1,5 +1,5 @@ -var c={[0]:"\u{1F41B}",[1]:"\u2139\uFE0F",[2]:"\u{1F4AC}",[3]:"\u26A0\uFE0F",[4]:"\u2620\uFE0F",[5]:"\u{1F9F5}"},p=class{constructor(e){this.opts=e||{},this.setPrefix(this.opts.prefix),this.currentLogLevel=this.getDefaultLogLevel()}setPrefix(e){if(!e)this.opts.prefix=c;else if(typeof e=="object"){this.opts.prefix={};for(let t of Object.keys(c))this.opts.prefix[t]=e[t]||c[t]}else this.opts.prefix=e}setLogLevel(e){this.currentLogLevel=e}debug(...e){this.print(console.debug,0,e)}info(...e){this.print(console.info,1,e)}log(...e){this.print(console.log,2,e)}warn(...e){this.print(console.warn,3,e)}error(...e){this.print(console.error,4,e)}group(...e){this.print(console.group,5,e)}groupCollapsed(...e){this.print(console.groupCollapsed,5,e)}groupEnd(){console.groupEnd()}print(e,t,o){this.currentLogLevel>t||e(...this.getArgs(t,o))}getArgs(e,t){let o=this.getPrefix(e);return o?[...o,...t]:t}getPrefix(e){let t=this.opts.prefix;t||(t=c);let o=t;return typeof o=="object"&&(o=t[e]),this.colorPrefix(e,o)}getDefaultLogLevel(){return 0}};var m={red:99,green:110,blue:114},v={red:72,green:126,blue:176},R={red:76,green:209,blue:55},x={red:225,green:177,blue:44},O={red:231,green:76,blue:60},E={red:0,green:168,blue:255};var h=class extends p{colorPrefix(e,t){return[`%c${t}`,this.getLevelCSS(e)]}getLevelCSS(e){function t(o){return`background: rgb(${o.red}, ${o.green}, ${o.blue}); color: white; padding: 2px 0.5em; border-radius: 0.5em`}switch(e){case 0:return t(m);case 1:return t(v);case 3:return t(x);case 4:return t(O);case 5:return t(E);case 2:default:return t(R)}}};var u=new h;function G(s){window.addEventListener("load",s),document.readyState=="complete"&&s()}u.setPrefix("ham/lite-vimeo");var r=class{constructor(e){this.element=e,this.anchor=e.querySelector(`${r.selector()}__link`);let t=e.getAttribute("videoid");if(!t){u.warn("Failed to get the 'videoid' attribute from element: ",e);return}this.videoID=encodeURIComponent(t),this.preconnected=!1,this.setup()}setup(){this.anchor.addEventListener("pointerover",()=>this.warmConnections(),{once:!0}),this.anchor.addEventListener("click",e=>{e.preventDefault(),this.addIframe()})}addIframe(){let e=``;this.element.removeChild(this.anchor),this.element.insertAdjacentHTML("beforeend",e),this.element.classList.add(`${r.classname()}--activated`)}addPrefetch(e,t,o){let n=document.createElement("link");n.rel=e,n.href=t,o&&(n.as=o),n.crossOrigin="",document.head.append(n)}warmConnections(){this.preconnected||(this.preconnected=!0,this.addPrefetch("preconnect","https://player.vimeo.com"),this.addPrefetch("preconnect","https://i.vimeocdn.com"),this.addPrefetch("preconnect","https://f.vimeocdn.com"),this.addPrefetch("preconnect","https://fresnel.vimeocdn.com"))}static classname(){return"n-ham-c-lite-vi"}static selector(){return`.${r.classname()}`}};G(function(){let s=document.querySelectorAll(r.selector());for(let e of s)new r(e)}); + >`;this.element.removeChild(this.anchor),this.element.insertAdjacentHTML("beforeend",e),this.element.classList.add(`${r.classname()}--activated`)}addPrefetch(e,t,o){let s=document.createElement("link");s.rel=e,s.href=t,o&&(s.as=o),s.crossOrigin="",document.head.append(s)}warmConnections(){this.preconnected||(this.preconnected=!0,this.addPrefetch("preconnect","https://player.vimeo.com"),this.addPrefetch("preconnect","https://i.vimeocdn.com"),this.addPrefetch("preconnect","https://f.vimeocdn.com"),this.addPrefetch("preconnect","https://fresnel.vimeocdn.com"))}static classname(){return"n-ham-c-lite-vi"}static selector(){return`.${r.classname()}`}};b(function(){let r=document.querySelectorAll(h.selector());for(let e of r)new h(e)}); diff --git a/embedassets/assets/js/components/n-ham-c-lite-yt-async.js b/embedassets/assets/js/components/n-ham-c-lite-yt-async.js index ad71085..60617aa 100644 --- a/embedassets/assets/js/components/n-ham-c-lite-yt-async.js +++ b/embedassets/assets/js/components/n-ham-c-lite-yt-async.js @@ -1 +1 @@ -var l={[0]:"\u{1F41B}",[1]:"\u2139\uFE0F",[2]:"\u{1F4AC}",[3]:"\u26A0\uFE0F",[4]:"\u2620\uFE0F",[5]:"\u{1F9F5}"},c=class{constructor(e){this.opts=e||{},this.setPrefix(this.opts.prefix),this.currentLogLevel=this.getDefaultLogLevel()}setPrefix(e){if(!e)this.opts.prefix=l;else if(typeof e=="object"){this.opts.prefix={};for(let t of Object.keys(l))this.opts.prefix[t]=e[t]||l[t]}else this.opts.prefix=e}setLogLevel(e){this.currentLogLevel=e}debug(...e){this.print(console.debug,0,e)}info(...e){this.print(console.info,1,e)}log(...e){this.print(console.log,2,e)}warn(...e){this.print(console.warn,3,e)}error(...e){this.print(console.error,4,e)}group(...e){this.print(console.group,5,e)}groupCollapsed(...e){this.print(console.groupCollapsed,5,e)}groupEnd(){console.groupEnd()}print(e,t,o){this.currentLogLevel>t||e(...this.getArgs(t,o))}getArgs(e,t){let o=this.getPrefix(e);return o?[...o,...t]:t}getPrefix(e){let t=this.opts.prefix;t||(t=l);let o=t;return typeof o=="object"&&(o=t[e]),this.colorPrefix(e,o)}getDefaultLogLevel(){return 0}};var v={red:99,green:110,blue:114},E={red:72,green:126,blue:176},R={red:76,green:209,blue:55},b={red:225,green:177,blue:44},x={red:231,green:76,blue:60},O={red:0,green:168,blue:255};var g=class extends c{colorPrefix(e,t){return[`%c${t}`,this.getLevelCSS(e)]}getLevelCSS(e){function t(o){return`background: rgb(${o.red}, ${o.green}, ${o.blue}); color: white; padding: 2px 0.5em; border-radius: 0.5em`}switch(e){case 0:return t(v);case 1:return t(E);case 3:return t(b);case 4:return t(x);case 5:return t(O);case 2:default:return t(R)}}};var h=new g;function w(s){window.addEventListener("load",s),document.readyState=="complete"&&s()}h.setPrefix("ham/lite-youtube");var P="n-ham-c-lite-yt",G=`.${P}`,m=class{constructor(e){this.element=e,this.anchor=e.querySelector(`${G}__link`);let t=this.requiredAttributes(e);!t||(this.videoID=encodeURIComponent(t.videoid),this.videoParams=t.videoparams,this.preconnected=!1,this.setup())}requiredAttributes(e){let t=["videoid","videoparams"],o={videoid:"",videoparams:""};for(let r of t){let f=e.getAttribute(r);if(!f)return h.error(`Failed to get the '${r}' attribute from element: `,e),null;o[r]=f}return o}setup(){this.anchor.addEventListener("pointerover",()=>this.warmConnections(),{once:!0}),this.anchor.addEventListener("click",e=>{e.preventDefault(),this.addIframe()})}addIframe(){let e=["autoplay=1"];this.videoParams&&e.push(this.videoParams);let t=``;this.element.removeChild(this.anchor),this.element.insertAdjacentHTML("beforeend",t),this.element.classList.add(`${P}--activated`)}addPrefetch(e,t,o){let r=document.createElement("link");r.rel=e,r.href=t,o&&(r.as=o),r.crossOrigin="",document.head.append(r)}warmConnections(){this.preconnected||(this.preconnected=!0,this.addPrefetch("preconnect","https://www.youtube-nocookie.com"),this.addPrefetch("preconnect","https://www.google.com"))}};w(function(){let s=document.querySelectorAll(G);for(let e of s)new m(e)}); +var l={[0]:"\u{1F41B}",[1]:"\u2139\uFE0F",[2]:"\u{1F4AC}",[3]:"\u26A0\uFE0F",[4]:"\u2620\uFE0F",[5]:"\u{1F9F5}"},c=class{constructor(e){this.opts=e||{},this.setPrefix(this.opts.prefix),this.currentLogLevel=this.getDefaultLogLevel()}setPrefix(e){if(!e)this.opts.prefix=l;else if(typeof e=="object"){this.opts.prefix={};for(let t of Object.keys(l))this.opts.prefix[t]=e[t]||l[t]}else this.opts.prefix=e}setLogLevel(e){this.currentLogLevel=e}debug(...e){this.print(console.debug,0,e)}info(...e){this.print(console.info,1,e)}log(...e){this.print(console.log,2,e)}warn(...e){this.print(console.warn,3,e)}error(...e){this.print(console.error,4,e)}group(...e){this.print(console.group,5,e)}groupCollapsed(...e){this.print(console.groupCollapsed,5,e)}groupEnd(){console.groupEnd()}print(e,t,o){this.currentLogLevel>t||e(...this.getArgs(t,o))}getArgs(e,t){let o=this.getPrefix(e);return o?[...o,...t]:t}getPrefix(e){let t=this.opts.prefix;t||(t=l);let o=t;return typeof o=="object"&&(o=t[e]),this.colorPrefix(e,o)}getDefaultLogLevel(){return 0}};var v={red:99,green:110,blue:114},E={red:72,green:126,blue:176},R={red:76,green:209,blue:55},b={red:225,green:177,blue:44},x={red:231,green:76,blue:60},O={red:0,green:168,blue:255};var g=class extends c{colorPrefix(e,t){return[`%c${t}`,this.getLevelCSS(e)]}getLevelCSS(e){function t(o){return`background: rgb(${o.red}, ${o.green}, ${o.blue}); color: white; padding: 2px 0.5em; border-radius: 0.5em`}switch(e){case 0:return t(v);case 1:return t(E);case 3:return t(b);case 4:return t(x);case 5:return t(O);case 2:default:return t(R)}}};var h=new g;function w(s){window.addEventListener("load",s),document.readyState=="complete"&&s()}h.setPrefix("ham/lite-youtube");var P="n-ham-c-lite-yt",G=`.${P}`,m=class{element;anchor;videoID;videoParams;preconnected;constructor(e){this.element=e,this.anchor=e.querySelector(`${G}__link`);let t=this.requiredAttributes(e);t&&(this.videoID=encodeURIComponent(t.videoid),this.videoParams=t.videoparams,this.preconnected=!1,this.setup())}requiredAttributes(e){let t=["videoid","videoparams"],o={videoid:"",videoparams:""};for(let r of t){let f=e.getAttribute(r);if(!f)return h.error(`Failed to get the '${r}' attribute from element: `,e),null;o[r]=f}return o}setup(){this.anchor.addEventListener("pointerover",()=>this.warmConnections(),{once:!0}),this.anchor.addEventListener("click",e=>{e.preventDefault(),this.addIframe()})}addIframe(){let e=["autoplay=1"];this.videoParams&&e.push(this.videoParams);let t=``;this.element.removeChild(this.anchor),this.element.insertAdjacentHTML("beforeend",t),this.element.classList.add(`${P}--activated`)}addPrefetch(e,t,o){let r=document.createElement("link");r.rel=e,r.href=t,o&&(r.as=o),r.crossOrigin="",document.head.append(r)}warmConnections(){this.preconnected||(this.preconnected=!0,this.addPrefetch("preconnect","https://www.youtube-nocookie.com"),this.addPrefetch("preconnect","https://www.google.com"))}};w(function(){let s=document.querySelectorAll(G);for(let e of s)new m(e)}); diff --git a/go.mod b/go.mod index eef1534..bbef98a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/gauntface/go-html-asset-manager/v4 +module github.com/gauntface/go-html-asset-manager/v5 go 1.19 @@ -38,7 +38,7 @@ require ( github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/stretchr/testify v1.7.0 // indirect - golang.org/x/image v0.5.0 // indirect + golang.org/x/image v0.8.0 // indirect golang.org/x/sys v0.9.0 // indirect golang.org/x/term v0.9.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 3faf878..0655fc8 100644 --- a/go.sum +++ b/go.sum @@ -1,457 +1,37 @@ -github.com/aws/aws-sdk-go-v2 v1.17.2 h1:r0yRZInwiPBNpQ4aDy/Ssh3ROWsGtKDwar2JS8Lm+N8= -github.com/aws/aws-sdk-go-v2 v1.17.2/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/PgrhY= -github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.17.4 h1:wyC6p9Yfq6V2y98wfDsj6OnNQa4w2BLGCLIxzNhwOGY= -github.com/aws/aws-sdk-go-v2 v1.17.4/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.17.5 h1:TzCUW1Nq4H8Xscph5M/skINUitxM5UBAyvm2s7XBzL4= -github.com/aws/aws-sdk-go-v2 v1.17.5/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.17.6 h1:Y773UK7OBqhzi5VDXMi1zVGsoj+CVHs2eaC2bDsLwi0= -github.com/aws/aws-sdk-go-v2 v1.17.6/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= -github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.17.8 h1:GMupCNNI7FARX27L7GjCJM8NgivWbRgpjNI/hOQjFS8= -github.com/aws/aws-sdk-go-v2 v1.17.8/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY= -github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.1 h1:+tefE750oAb7ZQGzla6bLkOwfcQCEtC5y2RqoqCeqKo= github.com/aws/aws-sdk-go-v2 v1.18.1/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.4 h1:VZKhr3uAADXHStS/Gf9xSYVmmaluTUfkc0dcbPiDsKE= -github.com/aws/aws-sdk-go-v2/config v1.18.4/go.mod h1:EZxMPLSdGAZ3eAmkqXfYbRppZJTzFTkv8VyEzJhKko4= -github.com/aws/aws-sdk-go-v2/config v1.18.5 h1:teGdDCAT3gX99FIKNt6HsvLaeOVdCFiCQDlH8UV6Xvg= -github.com/aws/aws-sdk-go-v2/config v1.18.5/go.mod h1:0g4tGVHeUTxekZIkO5Glw2AemETlmnkQvFqkdv3HBAA= -github.com/aws/aws-sdk-go-v2/config v1.18.6 h1:iSuEAeervBWMHA7Aaq5hCNfwuN2m7x2VuQCnEbbQg68= -github.com/aws/aws-sdk-go-v2/config v1.18.6/go.mod h1:qyjgnyqpKnNGT+C62zMsrZ/Mn2OodYqwIH0DpXiW8f8= -github.com/aws/aws-sdk-go-v2/config v1.18.7 h1:V94lTcix6jouwmAsgQMAEBozVAGJMFhVj+6/++xfe3E= -github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= -github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= -github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= -github.com/aws/aws-sdk-go-v2/config v1.18.9 h1:pd+QUO1dvro6vGOuhgglJV6adGunU95xSTSzsQGhKpY= -github.com/aws/aws-sdk-go-v2/config v1.18.9/go.mod h1:2Lx9yaA/McDeQS8ft+edKrmOd5ry1v1euFQ+oGwUxsM= -github.com/aws/aws-sdk-go-v2/config v1.18.10 h1:Znce11DWswdh+5kOsIp+QaNfY9igp1QUN+fZHCKmeCI= -github.com/aws/aws-sdk-go-v2/config v1.18.10/go.mod h1:VATKco+pl+Qe1WW+RzvZTlPPe/09Gg9+vM0ZXsqb16k= -github.com/aws/aws-sdk-go-v2/config v1.18.11 h1:7dJD4p90OyKYIihuwe/LbHfP7uw4yVm5P1hel+b8UZ8= -github.com/aws/aws-sdk-go-v2/config v1.18.11/go.mod h1:FTGKr2F7QL7IAg22dUmEB5NWpLPAOuhrONzXe7TVhAI= -github.com/aws/aws-sdk-go-v2/config v1.18.12 h1:fKs/I4wccmfrNRO9rdrbMO1NgLxct6H9rNMiPdBxHWw= -github.com/aws/aws-sdk-go-v2/config v1.18.12/go.mod h1:J36fOhj1LQBr+O4hJCiT8FwVvieeoSGOtPuvhKlsNu8= -github.com/aws/aws-sdk-go-v2/config v1.18.13 h1:v0xlYqbO6/EVlM8tUn2QEOA7btQxcgidEq2JRDBPTho= -github.com/aws/aws-sdk-go-v2/config v1.18.13/go.mod h1:r39wGSZB7wPDW1i54JyQXUpc5KsWjh5z/3S5D9eCqDg= -github.com/aws/aws-sdk-go-v2/config v1.18.14 h1:rI47jCe0EzuJlAO5ptREe3LIBAyP5c7gR3wjyYVjuOM= -github.com/aws/aws-sdk-go-v2/config v1.18.14/go.mod h1:0pI6JQBHKwd0JnwAZS3VCapLKMO++UL2BOkWwyyzTnA= -github.com/aws/aws-sdk-go-v2/config v1.18.15 h1:509yMO0pJUGUugBP2H9FOFyV+7Mz7sRR+snfDN5W4NY= -github.com/aws/aws-sdk-go-v2/config v1.18.15/go.mod h1:vS0tddZqpE8cD9CyW0/kITHF5Bq2QasW9Y1DFHD//O0= -github.com/aws/aws-sdk-go-v2/config v1.18.16 h1:4r7gsCu8Ekwl5iJGE/GmspA2UifqySCCkyyyPFeWs3w= -github.com/aws/aws-sdk-go-v2/config v1.18.16/go.mod h1:XjM6lVbq7UgELp9NjXBrb1DQY/ownlWsvDhEQksemJc= -github.com/aws/aws-sdk-go-v2/config v1.18.17 h1:jwTkhULSrbr/SQA8tfdYqZxpG8YsRycmIXxJcbrqY5E= -github.com/aws/aws-sdk-go-v2/config v1.18.17/go.mod h1:Lj3E7XcxJnxMa+AYo89YiL68s1cFJRGduChynYU67VA= -github.com/aws/aws-sdk-go-v2/config v1.18.18 h1:/ePABXvXl3ESlzUGnkkvvNnRFw3Gh13dyqaq0Qo3JcU= -github.com/aws/aws-sdk-go-v2/config v1.18.18/go.mod h1:Lj3E7XcxJnxMa+AYo89YiL68s1cFJRGduChynYU67VA= -github.com/aws/aws-sdk-go-v2/config v1.18.19 h1:AqFK6zFNtq4i1EYu+eC7lcKHYnZagMn6SW171la0bGw= -github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY= -github.com/aws/aws-sdk-go-v2/config v1.18.20 h1:yYy+onqmLmDVZtx0mkqbx8aJPl+58V6ivLbLDZ2Qztc= -github.com/aws/aws-sdk-go-v2/config v1.18.20/go.mod h1:RWjF39RiDevmHw/+VaD8F0A36OPIPTHQQyRx0eZohnw= -github.com/aws/aws-sdk-go-v2/config v1.18.21 h1:ENTXWKwE8b9YXgQCsruGLhvA9bhg+RqAsL9XEMEsa2c= -github.com/aws/aws-sdk-go-v2/config v1.18.21/go.mod h1:+jPQiVPz1diRnjj6VGqWcLK6EzNmQ42l7J3OqGTLsSY= -github.com/aws/aws-sdk-go-v2/config v1.18.22 h1:7vkUEmjjv+giht4wIROqLs+49VWmiQMMHSduxmoNKLU= -github.com/aws/aws-sdk-go-v2/config v1.18.22/go.mod h1:mN7Li1wxaPxSSy4Xkr6stFuinJGf3VZW3ZSNvO0q6sI= -github.com/aws/aws-sdk-go-v2/config v1.18.23 h1:gc3lPsAnZpwfi2exupmgHfva0JiAY2BWDg5JWYlmA28= -github.com/aws/aws-sdk-go-v2/config v1.18.23/go.mod h1:rx0ruaQ+gk3OrLFHRRx56lA//XxP8K8uPzeNiKNuWVY= -github.com/aws/aws-sdk-go-v2/config v1.18.24 h1:G0mJzpMjJFtK+7KtAky2kAjio21BdzNXblQSm2ZKsy0= -github.com/aws/aws-sdk-go-v2/config v1.18.24/go.mod h1:+9/RIaxGG2let2y9lIYEwOTBhaXqArOakom2TVytvFE= -github.com/aws/aws-sdk-go-v2/config v1.18.25 h1:JuYyZcnMPBiFqn87L2cRppo+rNwgah6YwD3VuyvaW6Q= -github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= -github.com/aws/aws-sdk-go-v2/config v1.18.26 h1:ivCHcSmKd1+9rBlqVsxZHB35eCW88KWbMdG2VL3BuBw= -github.com/aws/aws-sdk-go-v2/config v1.18.26/go.mod h1:NVmd//z/PNl7U+ZU2EnuffxOA060JWzgbH3BnqQrUoY= github.com/aws/aws-sdk-go-v2/config v1.18.27 h1:Az9uLwmssTE6OGTpsFqOnaGpLnKDqNYOJzWuC6UAYzA= github.com/aws/aws-sdk-go-v2/config v1.18.27/go.mod h1:0My+YgmkGxeqjXZb5BYme5pc4drjTnM+x1GJ3zv42Nw= -github.com/aws/aws-sdk-go-v2/credentials v1.13.4 h1:nEbHIyJy7mCvQ/kzGG7VWHSBpRB4H6sJy3bWierWUtg= -github.com/aws/aws-sdk-go-v2/credentials v1.13.4/go.mod h1:/Cj5w9LRsNTLSwexsohwDME32OzJ6U81Zs33zr2ZWOM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.5 h1:vrPwnKCdQlUyxXDZtPpb6Hc3GbTndqaGtEOwm/lF5tI= -github.com/aws/aws-sdk-go-v2/credentials v1.13.5/go.mod h1:sS/NgdbdkQ6XhVkGY/yEmNwxzpRVxLT3Ns+42W37p6g= -github.com/aws/aws-sdk-go-v2/credentials v1.13.6 h1:BXOMvv3O82/4JLggIi67WKlTO56f0rliCKBT4CKyf0o= -github.com/aws/aws-sdk-go-v2/credentials v1.13.6/go.mod h1:VbnUvhw31DUu6aiubViixQwWCBNO/st84dhPeOkmdls= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7 h1:qUUcNS5Z1092XBFT66IJM7mYkMwgZ8fcC8YDIbEwXck= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= -github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= -github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= -github.com/aws/aws-sdk-go-v2/credentials v1.13.9 h1:oxM/C8eXGsiHH+u0gZGo1++QTFPf+N5MUb1tfaaQMpU= -github.com/aws/aws-sdk-go-v2/credentials v1.13.9/go.mod h1:45DrDZTok50mEx4Uw59ym7n11Oy7G4gt0Pez2Z4ktAA= -github.com/aws/aws-sdk-go-v2/credentials v1.13.10 h1:T4Y39IhelTLg1f3xiKJssThnFxsndS8B6OnmcXtKK+8= -github.com/aws/aws-sdk-go-v2/credentials v1.13.10/go.mod h1:tqAm4JmQaShel+Qi38hmd1QglSnnxaYt50k/9yGQzzc= -github.com/aws/aws-sdk-go-v2/credentials v1.13.11 h1:QnvlTut1XXKkX4aaM1Ydo5X0CHriv0jmLu8PTVQQJJo= -github.com/aws/aws-sdk-go-v2/credentials v1.13.11/go.mod h1:tqAm4JmQaShel+Qi38hmd1QglSnnxaYt50k/9yGQzzc= -github.com/aws/aws-sdk-go-v2/credentials v1.13.12 h1:Cb+HhuEnV19zHRaYYVglwvdHGMJWbdsyP4oHhw04xws= -github.com/aws/aws-sdk-go-v2/credentials v1.13.12/go.mod h1:37HG2MBroXK3jXfxVGtbM2J48ra2+Ltu+tmwr/jO0KA= -github.com/aws/aws-sdk-go-v2/credentials v1.13.13 h1:zw1KAc1kl00NYd3ofVmFrb09qnYlSQMeh+fmlQRAihI= -github.com/aws/aws-sdk-go-v2/credentials v1.13.13/go.mod h1:DW9nbIIF9MrIja0cBQrUpeWYQMSlNmP8fevLUyF9W38= -github.com/aws/aws-sdk-go-v2/credentials v1.13.14 h1:jE34fUepssrhmYpvPpdbd+d39PHpuignDpNPNJguP60= -github.com/aws/aws-sdk-go-v2/credentials v1.13.14/go.mod h1:85ckagDuzdIOnZRwws1eLKnymJs3ZM1QwVC1XcuNGOY= -github.com/aws/aws-sdk-go-v2/credentials v1.13.15 h1:0rZQIi6deJFjOEgHI9HI2eZcLPPEGQPictX66oRFLL8= -github.com/aws/aws-sdk-go-v2/credentials v1.13.15/go.mod h1:vRMLMD3/rXU+o6j2MW5YefrGMBmdTvkLLGqFwMLBHQc= -github.com/aws/aws-sdk-go-v2/credentials v1.13.16 h1:GgToSxaENX/1zXIGNFfiVk4hxryYJ5Vt4Mh8XLAL7Lc= -github.com/aws/aws-sdk-go-v2/credentials v1.13.16/go.mod h1:KP7aFJhfwPFgx9aoVYL2nYHjya5WBD98CWaadpgmnpY= -github.com/aws/aws-sdk-go-v2/credentials v1.13.17 h1:IubQO/RNeIVKF5Jy77w/LfUvmmCxTnk2TP1UZZIMiF4= -github.com/aws/aws-sdk-go-v2/credentials v1.13.17/go.mod h1:K9xeFo1g/YPMguMUD69YpwB4Nyi6W/5wn706xIInJFg= -github.com/aws/aws-sdk-go-v2/credentials v1.13.18 h1:EQMdtHwz0ILTW1hoP+EwuWhwCG1hD6l3+RWFQABET4c= -github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.19 h1:FWHJy9uggyQCSEhovtl/6W6rW9P6DSr62GUeY/TS6Eo= -github.com/aws/aws-sdk-go-v2/credentials v1.13.19/go.mod h1:2m4uvLvl5hvQezVkLeBBUGMEDm5GcUNc3016W6d3NGg= -github.com/aws/aws-sdk-go-v2/credentials v1.13.20 h1:oZCEFcrMppP/CNiS8myzv9JgOzq2s0d3v3MXYil/mxQ= -github.com/aws/aws-sdk-go-v2/credentials v1.13.20/go.mod h1:xtZnXErtbZ8YGXC3+8WfajpMBn5Ga/3ojZdxHq6iI8o= -github.com/aws/aws-sdk-go-v2/credentials v1.13.21 h1:VRiXnPEaaPeGeoFcXvMZOB5K/yfIXOYE3q97Kgb0zbU= -github.com/aws/aws-sdk-go-v2/credentials v1.13.21/go.mod h1:90Dk1lJoMyspa/EDUrldTxsPns0wn6+KpRKpdAWc0uA= -github.com/aws/aws-sdk-go-v2/credentials v1.13.22 h1:Hp9rwJS4giQ48xqonRV/s7QcDf/wxF6UY7osRmBabvI= -github.com/aws/aws-sdk-go-v2/credentials v1.13.22/go.mod h1:BfNcm6A9nSd+bzejDcMJ5RE+k6WbkCwWkQil7q4heRk= -github.com/aws/aws-sdk-go-v2/credentials v1.13.23 h1:uKTIH4RmFIo04Pijn132WEMaboVLAg96H4l2KFRGzZU= -github.com/aws/aws-sdk-go-v2/credentials v1.13.23/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= -github.com/aws/aws-sdk-go-v2/credentials v1.13.24 h1:PjiYyls3QdCrzqUN35jMWtUK1vqVZ+zLfdOa/UPFDp0= -github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= -github.com/aws/aws-sdk-go-v2/credentials v1.13.25 h1:5wROoMcUC7nAE66e0b3IIht6Tos76M4HC+GQw8MeqxU= -github.com/aws/aws-sdk-go-v2/credentials v1.13.25/go.mod h1:W9I2660WXSwZQ23mM1Ks72+UGeyirIxuU7/KzN7daeA= github.com/aws/aws-sdk-go-v2/credentials v1.13.26 h1:qmU+yhKmOCyujmuPY7tf5MxR/RKyZrOPO3V4DobiTUk= github.com/aws/aws-sdk-go-v2/credentials v1.13.26/go.mod h1:GoXt2YC8jHUBbA4jr+W3JiemnIbkXOfxSXcisUsZ3os= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.20 h1:tpNOglTZ8kg9T38NpcGBxudqfUAwUzyUnLQ4XSd0CHE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.20/go.mod h1:d9xFpWd3qYwdIXM0fvu7deD08vvdRXyc/ueV+0SqaWE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.22 h1:3aMfcTmoXtTZnaT86QlVaYh+BRMbvrrmZwIQ5jWqCZQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.22/go.mod h1:YGSIJyQ6D6FjKMQh16hVFSIUD54L4F7zTGePqYMYYJU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.23 h1:Kbiv9PGnQfG/imNI4L/heyUXvzKmcWSBeDvkrQz5pFc= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.23/go.mod h1:mOtmAg65GT1HIL/HT/PynwPbS+UG0BgCZ6vhkPqnxWo= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24 h1:5qyqXASrX2zy5cTnoHHa4N2c3Lc94GH7gjnBP3GwKdU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24/go.mod h1:neYVaeKr5eT7BzwULuG2YbLhzWZ22lpjKdCybR7AXrQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.0 h1:/2Cb3SK3xVOQA7Xfr5nCWCo5H3UiNINtsVvVdk8sQqA= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.0/go.mod h1:neYVaeKr5eT7BzwULuG2YbLhzWZ22lpjKdCybR7AXrQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 h1:gt57MN3liKiyGopcqgNzJb2+d9MJaKT/q1OksHNXVE4= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2 h1:jOzQAesnBFDmz93feqKnsTHsXrlwWORNZMFHMV+WLFU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2/go.mod h1:cDh1p6XkSGSwSRIArWRc6+UqAQ7x4alQ0QfpVR6f+co= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 h1:jJPgroehGvjrde3XufFIJUZVK5A2L9a3KwSFgKy9n8w= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4 h1:LxK/bitrAr4lnh9LnIS6i7zWbCOdMsfzKFBI6LUCS0I= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4/go.mod h1:E1hLXN/BL2e6YizK1zFlYd8vsfi2GTjbjBazinMmeaM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.43 h1:+bkAMTd5OGyHu2nwNOangjEsP65fR0uhMbZJA52sZ64= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.43/go.mod h1:sS2tu0VEspKuY5eM1vQgy7P/hpZX8F62o6qsghZExWc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.44 h1:BXBHQeRh4fGFiiMZZd/WI/aAPwjhUCrWDhRDbuOZPIM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.44/go.mod h1:yFjq/63PmWzfzHk66kMsouDqS/ilrjFKWu269GWE6iw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.45 h1:ckFtXy51PT613d/KLKPxFiwRqgGIxDhVbNLof6x/XLo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.45/go.mod h1:xar61xizdVU4pQygvQrNdZY1VCLNcOIvm87KzdZmWrE= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 h1:OCX1pQ4pcqhsDV7B92HzdLWjHWOQsILvjLinpaUWhcc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46/go.mod h1:MxCBOcyNXGJRvfpPiH+L6n/BF9zbowthGSUZdDvQF/c= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 h1:E884ndKWVGt8IhtUuGhXbEsmaCvdAAkTTUDu7uAok1g= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47/go.mod h1:KybsEsmXLO0u75FyS3F0sY4OQ97syDe8z+ISq8oEczA= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.48 h1:3IGeA7Vh+gpp6Ptf0slDgNwFVTJEu81IiGl1v5yGZ3A= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.48/go.mod h1:kZ8I3L92ide4A8rLSEHofGn43eLE7E/m9H986uub0ns= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.49 h1:zPFhadkmXbXu3RVXTPU4HVW+g2DStMY+01cJaj//+Cw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.49/go.mod h1:N9gSChQkKpdAj7vRpfKma4ND88zoZM+v6W2lJgWrDh4= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.50 h1:ATgzvd5DaU0Evx7yvaUw2ftwiWDGnDN59zowPF3jDk0= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.50/go.mod h1:naA7bah2/dpvwlyWysZ7yaAYI1Ti73HPaDyGryfJuiU= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.51 h1:iTFYCAdKzSAjGnVIUe88Hxvix0uaBqr0Rv7qJEOX5hE= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.51/go.mod h1:7Grl2gV+dx9SWrUIgwwlUvU40t7+lOSbx34XwfmsTkY= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.52 h1:kqJOPKNVhASWCGtfPv/UYiWR7p0brlRhp5LuZJg8G6Y= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.52/go.mod h1:pwikD1mbvzt1Ok3LEFdMPlAlXpclPj5XY1JVR2LnwXQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.53 h1:h1MmqGtYgkf49DhG2BSjGukpm8c+BJ9CL+bBbdFGzlk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.53/go.mod h1:mlWLxwKZNeEwE+3Pko07lSr1NvHZwUtdzmo9AiGn7QU= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.54 h1:u4Cyifho7bnp6NeTCS8zAuxqzycHla4PSJvwXlU8ELI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.54/go.mod h1:a8gjZYNkBoxPMaA4mIoBT1M+4rOAcJUgFeaxVopMS+k= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.55 h1:ClZKHmu2QIRQCEQ2Y2upfu4JPO0pG69Ce5eiq3PS2V4= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.55/go.mod h1:L/h5B6I7reig2QJXCGY0e0NVx4hYCcjETmsfR02hFng= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.56 h1:kFDCPqqVvb9vYcW82L7xYfrBGpuxXQ/8A/zYVayRQK4= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.56/go.mod h1:FoSBuessadgy8Cqp9gQF8U5rzi1XVQhiEJ6su2/kBEE= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.57 h1:ubKS0iZH5veiqb44qeHzaoKNPvCZQeBVFw4JDhfeWjk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.57/go.mod h1:dRBjXtcjmYglxVHpdoGGVWvZumDC27I2GLDGI0Uw4RQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.58 h1:AFPYaPzlMno+YbnQGy+3ZfxO8Umh6wX56SEOpmuT6NI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.58/go.mod h1:fGEWh5NPS+2uQONSsIGIcbpJPIWoRu9unkcHgalx594= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 h1:E3Y+OfzOK1+rmRo/K2G0ml8Vs+Xqk0kOnf4nS0kUtBc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59/go.mod h1:1M4PLSBUVfBI0aP+C9XI7SM6kZPCGYyI6izWz0TGprE= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.60 h1:BRLcU36boYxw6BPOEvwJbDPuCtP7FqMhXMFk2NM6poM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.60/go.mod h1:HLWzCoNyzaPkOOs9yZ3muJ91lSk8O9DJbJw5aKAWWHY= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.61 h1:0fHTNkoMAz7jbXSyo0SLubbTJEO+AgvkZ0iWT9DbEsk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.61/go.mod h1:i8l1At/vjpY8xf1ivKUBJE4+DQyE0gM9Zdg3ZpC/7RU= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.62 h1:LhVbe/UDWvBT/jp5LYAweFVH8s+DNtT07Qp2riWEovU= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.62/go.mod h1:4xCuu1TSwhW5UH6WOdtS4/x/9UfMr2XplzKc86Ffj78= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.63 h1:3TZm9tzOXOX/aPAxBh3+LtMZtjHMzNO/wQ41+HFUzIA= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.63/go.mod h1:M1piIHmVL5lJ6OomRJdZtemge4TeGw6sPPsQzIIjHWw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.64 h1:9QJQs36z61YB8nxGwRDfWXEDYbU6H7jdI6zFiAX1vag= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.64/go.mod h1:4Q7R9MFpXRdjO3YnAfUTdnuENs32WzBkASt6VxSYDYQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.65 h1:4irvSxFf0u7pQdtpmUoDSjvMNpOG/8yDUq3orwd9qdg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.65/go.mod h1:BAWKiL53LT19UMewYr9YhZ8xPO69u6NwmGUjSjRwUdM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.66 h1:KoT+4UziVRvWNUOmbCxzFx00aOf1D6xHH5S/zvnbrKc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.66/go.mod h1:XUknnjpSZr/Zin6+WhN1AxDDmbSHfWK519IHkuEcezw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.67 h1:fI9/5BDEaAv/pv1VO1X1n3jfP9it+IGqWsCuuBQI8wM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.67/go.mod h1:zQClPRIwQZfJlZq6WZve+s4Tb4JW+3V6eS+4+KrYeP8= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.68 h1:0+IIldXpZPgIO1cvJJc1/83dzVOfeRWvSPUfED3fyfs= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.68/go.mod h1:LIq1+fhV5PgIQ3DhL8D20v4jTQ95wK0FywDFBiype1k= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.69 h1:u9tquzvPabbR1hghIq0+snSCYPeF9jA7JeB46iazH6w= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.69/go.mod h1:KzrYE4t9hLh8TjJkfGsmPYcVlYb7QWiPPv3aCOhwms0= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.70 h1:4bh28MeeXoBFTjb0JjQ5sVatzlf5xA1DziV8mZed9v4= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.70/go.mod h1:9yI5NXzqy2yOiMytv6QLZHvlyHLwYxO9iIq+bZIbrFg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.26 h1:5WU31cY7m0tG+AiaXuXGoMzo2GBQ1IixtWa8Yywsgco= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.26/go.mod h1:2E0LdbJW6lbeU4uxjum99GZzI0ZjDpAb0CoSCM0oeEY= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27/go.mod h1:a1/UpzeyBBerajpnP5nGZa9mGzsBn5cOKxm6NWQsvoI= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.28 h1:r+XwaCLpIvCKjBIYy/HVZujQS9tsz5ohHG3ZIe0wKoE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.28/go.mod h1:3lwChorpIM/BhImY/hy+Z6jekmN92cXGPI1QJasVPYY= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.29 h1:9/aKwwus0TQxppPXFmf010DFrE+ssSbzroLVYINA+xE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.29/go.mod h1:Dip3sIGv485+xerzVv24emnjX5Sg88utCL8fwGmCeWg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 h1:y+8n9AGDjikyXoMBTRaHHHSaFEB8267ykmvyPodJfys= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30/go.mod h1:LUBAO3zNXQjoONBKn/kR1y0Q4cj/D02Ts0uHYjcCQLM= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 h1:sJLYcS+eZn5EeNINGHSCRAwUJMFVqklwkH36Vbyai7M= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32 h1:dpbVNUjczQ8Ae3QKHbpHBpfvaVkRdesxpTOe9pTouhU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32/go.mod h1:RudqOgadTWdcS3t/erPQo24pcVEoYyqj/kKW5Vya21I= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 h1:kG5eQilShqmJbv11XL1VpyDbaEJzWxd4zRiCG30GSn4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34 h1:A5UqQEmPaCFpedKouS4v+dHCTUo2sKqhoKO9U5kxyWo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34/go.mod h1:wZpTEecJe0Btj3IYnDx/VlUzor9wm3fJHyvLpQF0VwY= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.20 h1:WW0qSzDWoiWU2FS5DbKpxGilFVlCEJPwx4YtjdfI0Jw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.20/go.mod h1:/+6lSiby8TBFpTVXZgKiN/rCfkYXEGvhlM4zCgPpt7w= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 h1:5NbbMrIzmUn/TXFqAle6mgrH5m9cOvMLRGL7pnG8tRE= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21/go.mod h1:+Gxn8jYn5k9ebfHEqlhrMirFjSW0v0C9fI+KN5vk2kE= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.22 h1:7AwGYXDdqRQYsluvKFmWoqpcOQJ4bH634SkYf3FNj/A= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.22/go.mod h1:EqK7gVrIGAHyZItrD1D8B0ilgwMD1GiWAmbU4u/JHNk= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.23 h1:b/Vn141DBuLVgXbhRWIrl9g+ww7G+ScV5SzniWR13jQ= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.23/go.mod h1:mr6c4cHC+S/MMkrjtSlG4QA36kOznDep+0fga5L/fGQ= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24 h1:r+Kv+SEJquhAZXaJ7G4u44cIwXV3f8K+N482NNAzJZA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24/go.mod h1:gAuCezX/gob6BSMbItsSlMb6WZGV7K2+fWOvk8xBSto= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25 h1:1mnRASEKnkqsntcxHaysxwgVoUUp5dkiB+l3llKnqyg= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26 h1:QH2kOS3Ht7x+u0gHCh06CXL/h6G8LQJFpZfFBYBNboo= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26/go.mod h1:vq86l7956VgFr0/FWQ2BWnK07QC3WYsepKzy33qqY5U= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 h1:vFQlirhuM8lLlpI7imKOMsjdQLuN9CPi+k44F/OFVsk= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28 h1:srIVS45eQuewqz6fKKu6ZGXaq6FuFg5NzgQBAM6g8Y4= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28/go.mod h1:7VRpKQQedkfIEXb4k52I7swUnZP0wohVajJMRn3vsUw= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.27 h1:N2eKFw2S+JWRCtTt0IhIX7uoGGQciD4p6ba+SJv4WEU= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.27/go.mod h1:RdwFVc7PBYWY33fa2+8T1mSqQ7ZEK4ILpM0wfioDC3w= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 h1:KeTxcGdNnQudb46oOl4d90f2I33DF/c6q3RnZAmvQdQ= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28/go.mod h1:yRZVr/iT0AqyHeep00SZ4YfBAKojXz08w3XMBscdi0c= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.29 h1:J4xhFd6zHhdF9jPP0FQJ6WknzBboGMBNjKOv4iTuw4A= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.29/go.mod h1:TwuqRBGzxjQJIwH16/fOZodwXt2Zxa9/cwJC5ke4j7s= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.30 h1:IVx9L7YFhpPq0tTnGo8u8TpluFu7nAn9X3sUDMb11c0= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.30/go.mod h1:vsbq62AOBwQ1LJ/GWKFxX8beUEYeRp/Agitrxee2/qM= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.31 h1:hf+Vhp5WtTdcSdE+yEcUz8L73sAzN0R+0jQv+Z51/mI= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.31/go.mod h1:5zUjguZfG5qjhG9/wqmuyHRyUftl2B5Cp6NNxNC6kRA= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 h1:p5luUImdIqywn6JpQsW3tq5GNOxKmOnEpybzPx+d1lk= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33 h1:HbH1VjUgrCdLJ+4lnnuLI4iVNRvBbBELGaJ5f69ClA8= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33/go.mod h1:zG2FcwjQarWaqXSCGpgcr3RSjZ6dHGguZSppUL0XR7Q= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 h1:gGLG7yKaXG02/jBlg210R7VgQIotiQntNhsCFejawx8= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35 h1:LWA+3kDM8ly001vJ1X1waCuLJdtTl48gwkPKWy9sosI= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35/go.mod h1:0Eg1YjxE0Bhn56lx+SHJwCzhW+2JGtizsrx+lCqrfm0= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.17 h1:5tXbMJ7Jq0iG65oiMg6tCLsHkSaO2xLXa2EmZ29vaTA= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.17/go.mod h1:twV0fKMQuqLY4klyFH56aXNq3AFiA5LO0/frTczEOFE= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18 h1:H/mF2LNWwX00lD6FlYfKpLLZgUW7oIzCBkig78x4Xok= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18/go.mod h1:T2Ku+STrYQ1zIkL1wMvj8P3wWQaaCMKNdz70MT2FLfE= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.19 h1:FGvpyTg2LKEmMrLlpjOgkoNp9XF5CGeyAyo33LdqZW8= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.19/go.mod h1:8W88sW3PjamQpKFUQvHWWKay6ARsNvZnzU7+a4apubw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.20 h1:YIvKIfPXQVp0EhXUV644kmQo6cQPPSRmC44A1HSoJeg= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.20/go.mod h1:8W88sW3PjamQpKFUQvHWWKay6ARsNvZnzU7+a4apubw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.21 h1:QdxdY43AiwsqG/VAqHA7bIVSm3rKr8/p9i05ydA0/RM= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.21/go.mod h1:QtIEat7ksHH8nFItljyvMI0dGj8lipK2XZ4PhNihTEU= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.22 h1:lTqBRUuy8oLhBsnnVZf14uRbIHPHCrGqg4Plc8gU/1U= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.22/go.mod h1:YsOa3tFriwWNvBPYHXM5ARiU2yqBNWPWeUiq+4i7Na0= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 h1:DWYZIsyqagnWL00f8M/SOr9fN063OEQWn9LLTbdYXsk= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23/go.mod h1:uIiFgURZbACBEQJfqTZPb/jxO7R+9LeoHUFudtIdeQI= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.24 h1:zsg+5ouVLLbePknVZlUMm1ptwyQLkjjLMWnN+kVs5dA= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.24/go.mod h1:+fFaIjycTmpV6hjmPTbyU9Kp5MI/lA+bbibcAtmlhYA= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 h1:AzwRi5OKKwo4QNqPf7TjeO+tK8AyOK3GVSwmRPo7/Cs= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25/go.mod h1:SUbB4wcbSEyCvqBxv/O/IBf93RbEze7U7OnoTlpPB+g= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26 h1:wscW+pnn3J1OYnanMnza5ZVYXLX4cKk5rAvUAl4Qu+c= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26/go.mod h1:MtYiox5gvyB+OyP0Mr0Sm/yzbEAIPL9eijj/ouHAPw0= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.21 h1:77b1GfaSuIok5yB/3HYbG+ypWvOJDQ2rVdq943D17R4= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.21/go.mod h1:sPOz31BVdqeeurKEuUpLNSve4tdCNPluE+070HNcEHI= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 h1:kv5vRAl00tozRxSnI0IszPWGXsJOyA7hmEUHFYqsyvw= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22/go.mod h1:Od+GU5+Yx41gryN/ZGZzAJMZ9R1yn6lgA0fD5Lo5SkQ= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.23 h1:c5+bNdV8E4fIPteWx4HZSkqI07oY9exbfQ7JH7Yx4PI= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.23/go.mod h1:1jcUfF+FAOEwtIcNiHPaV4TSoZqkUIPzrohmD7fb95c= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.24 h1:Qmm8klpAdkuN3/rPrIMa/hZQ1z93WMBPjOzdAsbSnlo= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.24/go.mod h1:QelGeWBVRh9PbbXsfXKTFlU9FjT6W2yP+dW5jMQzOkg= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.25 h1:B/hO3jfWRm7hP00UeieNlI5O2xP5WJ27tyJG5lzc7AM= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.25/go.mod h1:54K1zgxK/lai3a4HosE4IKBwZsP/5YAJ6dzJfwsjJ0U= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 h1:CeuSeq/8FnYpPtnuIeLQEEvDv9zUjneuYi8EghMBdwQ= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26/go.mod h1:2UqAAwMUXKeRkAHIlDJqvMVgOWkUi/AUXPk/YIe+Dg4= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.27 h1:qIw7Hg5eJEc1uSxg3hRwAthPAO7NeOd4dPxhaTi0yB0= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.27/go.mod h1:Zz0kvhcSlu3NX4XJkaGgdjaa+u7a9LYuy8JKxA5v3RM= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 h1:vGWm5vTpMr39tEZfQeDiDAMgk+5qsnvRny3FjLpnH5w= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28/go.mod h1:spfrICMD6wCAhjhzHuy6DOZZ+LAIY10UxhUmLzpJTTs= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29 h1:zZSLP3v3riMOP14H7b4XP0uyfREDQOYv2cqIrvTXDNQ= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29/go.mod h1:z7EjRjVwZ6pWcWdI2H64dKttvzaP99jRIj5hphW0M5U= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.20 h1:jlgyHbkZQAgAc7VIxJDmtouH8eNjOk2REVAQfVhdaiQ= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.20/go.mod h1:Xs52xaLBqDEKRcAfX/hgjmD3YQ7c/W+BEyfamlO/W2E= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViSb0bunmU57b3CT+MhxULqHH2721FVA+/kDM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.22 h1:LjFQf8hFuMO22HkV5VWGLBvmCLBCLPivUAmpdpnp4Vs= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.22/go.mod h1:xt0Au8yPIwYXf/GYPy/vl4K3CgwhfQMYbrH7DlUUIws= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.23 h1:QoOybhwRfciWUBbZ0gp9S7XaDnCuSTeK/fySB99V1ls= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.23/go.mod h1:9uPh+Hrz2Vn6oMnQYiUi/zbh3ovbnQk19YKINkQny44= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.24 h1:c5qGfdbCHav6viBwiyDns3OXqhqAbGjfIB4uVu2ayhk= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.24/go.mod h1:HMA4FZG6fyib+NDo5bpIxX1EhYjrAOveZJY2YR0xrNE= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 h1:5LHn8JQ0qvjD9L9JhMtylnkcw7j05GDZqM9Oin6hpr0= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26 h1:uUt4XctZLhl9wBE1L8lobU3bVN8SNUP7T+olb0bWBO4= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26/go.mod h1:Bd4C/4PkVGubtNe5iMXu5BNnaBi/9t/UsFspPt4ram8= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 h1:0iKliEXAcCa2qVtRs7Ot5hItA2MsufrphbRFlz1Owxo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28 h1:bkRyG4a929RCnpVSTvLM2j/T4ls015ZhhYApbmYs15s= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28/go.mod h1:jj7znCIg05jXlaGBlFMGP8+7UN3VtCkRBG2spnmRQkU= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.20 h1:4K6dbmR0mlp3o4Bo78PnpvzHtYAqEeVMguvEenpMGsI= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.20/go.mod h1:1XpDcReIEOHsjwNToDKhIAO3qwLo1BnfbtSqWJa8j7g= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrOKm2qKEf9tliBfdLxdfy0i02LOcmqUo= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.22 h1:ISLJ2BKXe4zzyZ7mp5ewKECiw0U7KpLgS3S6OxY9Cm0= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.22/go.mod h1:QFVbqK54XArazLvn2wvWMRBi/jGrWii46qbr5DyPGjc= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.23 h1:qc+RW0WWZ2KApMnsu/EVCPqLTyIH55uc7YQq7mq4XqE= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.23/go.mod h1:FJhZWVWBCcgAF8jbep7pxQ1QUsjzTwa9tvEXGw2TDRo= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.24 h1:i4RH8DLv/BHY0fCrXYQDr+DGnWzaxB3Ee/esxUaSavk= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.24/go.mod h1:N8X45/o2cngvjCYi2ZnvI0P4mU4ZRJfEYC3maCSsPyw= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 h1:e2ooMhpYGhDnBfSvIyusvAwX7KexuZaHbQY2Dyei7VU= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0/go.mod h1:bh2E0CXKZsQN+faiKVqC40vfNMAWheoULBCnEgO9K+8= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.1 h1:lRWp3bNu5wy0X3a8GS42JvZFlv++AKsMdzEnoiVJrkg= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.1/go.mod h1:VXBHSxdN46bsJrkniN68psSwbyBKsazQfU2yX/iSDso= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 h1:NbWkRxEEIRSCqxhsHQuMiTH7yo+JZW1gp8v3elSVMTQ= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2/go.mod h1:4tfW5l4IAB32VWCDEBxCRtR9T4BWy4I4kr1spr8NgZM= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 h1:dBL3StFxHtpBzJJ/mNEsjXVgfO+7jR0dAIEwLqMapEA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3/go.mod h1:f1QyiAsvIv4B49DmCqrhlXqyaR+0IxMmyX+1P+AnzOM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.5 h1:nRSEQj1JergKTVc8RGkhZvOEGgcvo4fWpDPwGDeg2ok= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.5/go.mod h1:wcaJTmjKFDW0s+Se55HBNIds6ghdAGoDDw+SGUdrfAk= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.1 h1:kIgvVY7PHx4gIb0na/Q9gTWJWauTwhKdaqJjX8PkIY8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.1/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.2 h1:5EQWIFO+Hc8E2hFcXQJ1vm6ufl/PMt/6RVRDZRju2vM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.2/go.mod h1:SXDHd6fI2RhqB7vmAzyYQCTQnpZrIprVJvYxpzW3JAM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.3 h1:PVieHTwugdlHedlxLpYLQsOZAq736RScuEb/m4zhzc4= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.3/go.mod h1:XN3YcdmnWYZ3Hrnojvo5p2mc/wfF973nkq3ClXPDMHk= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.4 h1:0eeEl2lyZkZPhPCt9ggIr3PbCbvae3vfggTkeqJ4O98= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.4/go.mod h1:Dze3kNt4T+Dgb8YCfuIFSBLmE6hadKNxqfdF0Xmqz1I= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.5 h1:kFfb+NMap4R7nDvBYyABa/nw7KFMtAfygD1Hyoxh4uE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.5/go.mod h1:Dze3kNt4T+Dgb8YCfuIFSBLmE6hadKNxqfdF0Xmqz1I= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.6 h1:zzTm99krKsFcF4N7pu2z17yCcAZpQYZ7jnJZPIgEMXE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.30.6/go.mod h1:PudwVKUTApfm0nYaPutOXaKdPKTlZYClGBQpVIRdcbs= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 h1:B1G2pSPvbAtQjilPq+Y7jLIzCOwKzuVEl+aBBaNG0AQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0/go.mod h1:ncltU6n4Nof5uJttDtcNQ537uNuwYqsZZQcpkd2/GUQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.1 h1:PJH4I+qYjPXclKRbVCW47iYUvtXEh1u6YmDhn5J8VQE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.1/go.mod h1:ncltU6n4Nof5uJttDtcNQ537uNuwYqsZZQcpkd2/GUQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.2 h1:iOZoYePk+EuBI1tC7bxeRjO+JvClcYm2fZYW5WPIOMQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.2/go.mod h1:aSl9/LJltSz1cVusiR/Mu8tvI4Sv/5w/WWrJmmkNii0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.3 h1:MG+2UlhyBL3oCOoHbUQh+Sqr3elN0I5PBe0MtVh0xMg= -github.com/aws/aws-sdk-go-v2/service/s3 v1.31.3/go.mod h1:aSl9/LJltSz1cVusiR/Mu8tvI4Sv/5w/WWrJmmkNii0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.32.0 h1:NAc8WQsVQ3+kz3rU619mlz8NcbpZI6FVJHQfH33QK0g= -github.com/aws/aws-sdk-go-v2/service/s3 v1.32.0/go.mod h1:aSl9/LJltSz1cVusiR/Mu8tvI4Sv/5w/WWrJmmkNii0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.33.0 h1:L5h2fymEdVJYvn6hYO8Jx48YmC6xVmjmgHJV3oGKgmc= -github.com/aws/aws-sdk-go-v2/service/s3 v1.33.0/go.mod h1:J9kLNzEiHSeGMyN7238EjJmBpCniVzFda75Gxl/NqB8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 h1:O+9nAy9Bb6bJFTpeNFtd9UfHbgxO1o4ZDAM9rQp5NsY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1/go.mod h1:J9kLNzEiHSeGMyN7238EjJmBpCniVzFda75Gxl/NqB8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.34.0 h1:2qt8zaVqQCMpnQHBB+PAbfSSXgMl9+zpTRNDHmachJk= -github.com/aws/aws-sdk-go-v2/service/s3 v1.34.0/go.mod h1:aVbf0sko/TsLWHx30c/uVu7c62+0EAJ3vbxaJga0xCw= -github.com/aws/aws-sdk-go-v2/service/s3 v1.34.1 h1:rYYwwsGqbwvGgQHjBkqgDt8MynXk+I8xgS0IEj5gOT0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.34.1/go.mod h1:aVbf0sko/TsLWHx30c/uVu7c62+0EAJ3vbxaJga0xCw= github.com/aws/aws-sdk-go-v2/service/s3 v1.35.0 h1:ya7fmrN2fE7s1P2gaPbNg5MTkERVWfsH8ToP1YC4Z9o= github.com/aws/aws-sdk-go-v2/service/s3 v1.35.0/go.mod h1:aVbf0sko/TsLWHx30c/uVu7c62+0EAJ3vbxaJga0xCw= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.26 h1:ActQgdTNQej/RuUJjB9uxYVLDOvRGtUreXF8L3c8wyg= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.26/go.mod h1:uB9tV79ULEZUXc6Ob18A46KSQ0JDlrplPni9XW6Ot60= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.27 h1:Nmvn0DJKg00TBmoBweK253Kdsuy4V5Rs68yL/H15uBQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.27/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 h1:gItLq3zBYyRDPmqAClgzTH8PBjDQGeyptYGHIwtYYNA= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.1 h1:lQKN/LNa3qqu2cDOQZybP7oL4nMGGiFqob0jZJaR8/4= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.1/go.mod h1:IgV8l3sj22nQDd5qcAGY0WenwCzCphqdbFOpfktZPrI= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.2 h1:EN102fWY7hI5u/2FPheTrwwMHkSXfl49RYkeEnJsrCU= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.2/go.mod h1:IgV8l3sj22nQDd5qcAGY0WenwCzCphqdbFOpfktZPrI= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.3 h1:bUeZTWfF1vBdZnoNnnq70rB/CzdZD7NR2Jg2Ax+rvjA= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.3/go.mod h1:jtLIhd+V+lft6ktxpItycqHqiVXrPIRjWIsFIlzMriw= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.4 h1:qJdM48OOLl1FBSzI7ZrA1ZfLwOyCYqkXV5lko1hYDBw= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.4/go.mod h1:jtLIhd+V+lft6ktxpItycqHqiVXrPIRjWIsFIlzMriw= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.5 h1:bdKIX6SVF3nc3xJFw6Nf0igzS6Ff/louGq8Z6VP/3Hs= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.5/go.mod h1:vuWiaDB30M/QTC+lI3Wj6S/zb7tpUK2MSYgy3Guh2L0= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 h1:5V7DWLBd7wTELVz5bPpwzYy/sikk0gsgZfj40X+l5OI= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.7 h1:rrYYhsvcvg6CDDoo4GHKtAWBFutS86CpmGvqHJHYL9w= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.7/go.mod h1:GNIveDnP+aE3jujyUSH5aZ/rktsTM5EvtKnCqBZawdw= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.8 h1:5cb3D6xb006bPTqEfCNaEA6PPEfBXxxy4NNeX/44kGk= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.8/go.mod h1:GNIveDnP+aE3jujyUSH5aZ/rktsTM5EvtKnCqBZawdw= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 h1:GAiaQWuQhQQui76KjuXeShmyXqECwQ0mGRMc/rwsL+c= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.9/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 h1:UBQjaMTCKwyUYwiVnUt6toEJwGXsLBI6al083tpjJzY= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.11 h1:cNrMc266RsZJ8V1u1OQQONKcf9HmfxQFqgcpY7ZJBhY= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.11/go.mod h1:HuCOxYsF21eKrerARYO6HapNeh9GBNq7fius2AcwodY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.12 h1:nneMBM2p79PGWBQovYO/6Xnc2ryRMw3InnDJq1FHkSY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.12/go.mod h1:HuCOxYsF21eKrerARYO6HapNeh9GBNq7fius2AcwodY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.9 h1:wihKuqYUlA2T/Rx+yu2s6NDAns8B9DgnRooB1PVhY+Q= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.9/go.mod h1:2E/3D/mB8/r2J7nK42daoKP/ooCwbf0q1PznNc+DZTU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.10 h1:tGOUUjINuqI8sD6pn+Ku0/f/4UfRDlK+jJUOaxEbWuQ= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.10/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 h1:KCacyVSs/wlcPGx37hcbT3IGYO8P8Jx+TgSDhAXtQMY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.1 h1:0bLhH6DRAqox+g0LatcjGKjjhU6Eudyys6HB6DJVPj8= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.1/go.mod h1:O1YSOg3aekZibh2SngvCRRG+cRHKKlYgxf/JBF/Kr/k= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.2 h1:f1lmlce7r13CX1BPyPqt9oh/H+uqOWc9367lDoGGwNQ= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.2/go.mod h1:O1YSOg3aekZibh2SngvCRRG+cRHKKlYgxf/JBF/Kr/k= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.3 h1:G/+7NUi+q+H0LG3v32jfV4OkaQIcpI92g0owbXKk6NY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.3/go.mod h1:zVwRrfdSmbRZWkUkWjOItY7SOalnFnq/Yg2LVPqDjwc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.4 h1:YRkWXQveFb0tFC0TLktmmhGsOcCgLwvq88MC2al47AA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.4/go.mod h1:zVwRrfdSmbRZWkUkWjOItY7SOalnFnq/Yg2LVPqDjwc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.5 h1:xLPZMyuZ4GuqRCIec/zWuIhRFPXh2UOJdLXBSi64ZWQ= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.5/go.mod h1:QjxpHmCwAg0ESGtPQnLIVp7SedTOBMYy+Slr3IfMKeI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 h1:B8cauxOH1W1v7rd8RdI/MWnoR4Ze0wIHWrb90qczxj4= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.7 h1:Vjpjt3svuJ/u+eKRfycZwqLsLoxyuvvZyHMJSk+3k58= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.7/go.mod h1:44qFP1g7pfd+U+sQHLPalAPKnyfTZjJsYR4xIwsJy5o= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8 h1:NZaj0ngZMzsubWZbrEFSB4rgSQRbFq38Sd6KBxHuOIU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.8/go.mod h1:44qFP1g7pfd+U+sQHLPalAPKnyfTZjJsYR4xIwsJy5o= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 h1:TraLwncRJkWqtIBVKI/UqBymq4+hL+3MzUOtUATuzkA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 h1:PkHIIJs8qvq0e5QybnZoG1K/9QTrLr9OsqCIo59jOBA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.11 h1:h2VhtCE5PBiJefmlVCjJRSzBfFcQeAE10SXIGkXw1jQ= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.11/go.mod h1:E4VrHCPzmVB/KFXtqBGKb3c8zpbNBgKe3fisDNLAW5w= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12 h1:2qTR7IFk7/0IN/adSFhYu9Xthr0zVFTgBrmPldILn80= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12/go.mod h1:E4VrHCPzmVB/KFXtqBGKb3c8zpbNBgKe3fisDNLAW5w= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.6 h1:VQFOLQVL3BrKM/NLO/7FiS4vcp5bqK0mGMyk09xLoAY= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.6/go.mod h1:Az3OXXYGyfNwQNsK/31L4R75qFYnO641RZGAoV3uH1c= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 h1:9Mtq1KM6nD8/+HStvWcvYnixJ5N85DX+P+OY3kI3W2k= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.1 h1:q3xG67qnKp1gsYSJY5AtTvFKY2IlmGPGrTw/Wy8EjeQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.1/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.2 h1:J/4wIaGInCEYCGhTSruxCxeoA5cy91a+JT7cHFKFSHQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.2/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.3 h1:s49mSnsBZEXjfGBkRfmK+nPqzT7Lt3+t2SmAKNyHblw= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.3/go.mod h1:b+psTJn33Q4qGoDaM7ZiOVVG8uVjGI6HaZ8WBHdgDgU= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.4 h1:j0USUNbl9c/8tBJ8setEbwxc7wva0WyoeAaFRiyTUT8= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.4/go.mod h1:1mKZHLLpDMHTNSYPJ7qrcnCQdHCWsNQaT0xRvq2u80s= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.5 h1:L1600eLr0YvTT7gNh3Ni24yGI7NSHkq9Gp62vijPRCs= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.5/go.mod h1:1mKZHLLpDMHTNSYPJ7qrcnCQdHCWsNQaT0xRvq2u80s= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.6 h1:rIFn5J3yDoeuKCE9sESXqM5POTAhOP1du3bv/qTL+tE= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.6/go.mod h1:48WJ9l3dwP0GSHWGc5sFGGlCkuA82Mc2xnw+T6Q8aDw= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 h1:bWNgNdRko2x6gqa0blfATqAZKZokPIeM1vfmQt2pnvM= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.8 h1:SQ8pPoXfzuz4DImO4KAi9xhO4ANG0Ckb5clZ5GoRAPw= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.8/go.mod h1:yyW88BEPXA2fGFyI2KCcZC3dNpiT0CZAHaF+i656/tQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.9 h1:Qf1aWwnsNkyAoqDqmdM3nHwN78XQjec27LjM6b9vyfI= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.9/go.mod h1:yyW88BEPXA2fGFyI2KCcZC3dNpiT0CZAHaF+i656/tQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 h1:6UbNM/KJhMBfOI5+lpVcJ/8OA7cBSz0O6OX37SRKlSw= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.10/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.11 h1:uBE+Zj478pfxV98L6SEpvxYiADNjTlMNY714PJLE7uo= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.11/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 h1:2DQLAKDteoEDI8zpCzqBMaZlJuoE9iTYD0gFmXVax9E= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.1 h1:ehPTnLR/es8TL1fpBfq8qw9cAwOpQr47fLmZD9yhHjk= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.1/go.mod h1:dp0yLPsLBOi++WTxzCjA/oZqi6NPIhoR+uF7GeMU9eg= github.com/aws/aws-sdk-go-v2/service/sts v1.19.2 h1:XFJ2Z6sNUUcAz9poj+245DMkrHE4h2j5I9/xD50RHfE= github.com/aws/aws-sdk-go-v2/service/sts v1.19.2/go.mod h1:dp0yLPsLBOi++WTxzCjA/oZqi6NPIhoR+uF7GeMU9eg= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= @@ -459,7 +39,6 @@ github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J github.com/chai2010/webp v1.1.1 h1:jTRmEccAJ4MGrhFOrPMpNGIJ/eybIgwKpcACsrTEapk= github.com/chai2010/webp v1.1.1/go.mod h1:0XVwvZWdjjdxpUEIf7b9g9VkHFnInUSYujwqTLEuldU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= @@ -468,10 +47,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= @@ -479,121 +56,64 @@ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2Em github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/otiai10/copy v1.9.0 h1:7KFNiCgZ91Ru4qW4CWPf/7jqtxLagGRmIxWldPP9VY4= -github.com/otiai10/copy v1.9.0/go.mod h1:hsfX19wcn0UWIHUQ3/4fHuehhk2UyArQ9dVFAn3FczI= -github.com/otiai10/copy v1.10.0 h1:znyI7l134wNg/wDktoVQPxPkgvhDfGCYUasey+h0rDQ= -github.com/otiai10/copy v1.10.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= github.com/otiai10/copy v1.11.0 h1:OKBD80J/mLBrwnzXqGtFCzprFSGioo30JcmR4APsNwc= github.com/otiai10/copy v1.11.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.4.0 h1:umwcf7gbpEwf7WFzqmWwSv0CzbeMsae2u9ZvpP8j2q4= -github.com/otiai10/mint v1.4.0/go.mod h1:gifjb2MYOoULtKLqUAEILUG/9KONW6f7YsJ6vQLTlFI= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= -github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/schollz/progressbar/v3 v3.12.2 h1:yLqqqpQNMxGxHY8uEshRihaHWwa0rf0yb7/Zrpgq2C0= -github.com/schollz/progressbar/v3 v3.12.2/go.mod h1:HFJYIYQQJX32UJdyoigUl19xoV6aMwZt6iX/C30RWfg= -github.com/schollz/progressbar/v3 v3.13.0 h1:9TeeWRcjW2qd05I8Kf9knPkW4vLM/hYoa6z9ABvxje8= -github.com/schollz/progressbar/v3 v3.13.0/go.mod h1:ZBYnSuLAX2LU8P8UiKN/KgF2DY58AJC8yfVYLPC8Ly4= github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE= github.com/schollz/progressbar/v3 v3.13.1/go.mod h1:xvrbki8kfT1fzWzBT/UZd9L6GA+jdL7HAgq2RFnO6fQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.2.0 h1:/DcQ0w3VHKCC5p0/P2B0JpAZ9Z++V2KOo2fyU89CXBQ= -golang.org/x/image v0.2.0/go.mod h1:la7oBXb9w3YFjBqaAwtynVioc1ZvOnNteUNrifGNmAI= -golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI= -golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4= +golang.org/x/image v0.8.0 h1:agUcRXV/+w6L9ryntYYsF2x9fQTMd4T8fiiYXAVW6Jg= +golang.org/x/image v0.8.0/go.mod h1:PwLxp3opCYg4WR2WO9P0L6ESnsD6bLTWcw8zanLMVFM= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/manipulations/asyncsrc/asyncsrc.go b/manipulations/asyncsrc/asyncsrc.go index 3da9e8f..d190f8c 100644 --- a/manipulations/asyncsrc/asyncsrc.go +++ b/manipulations/asyncsrc/asyncsrc.go @@ -17,8 +17,8 @@ package asyncsrc import ( - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" ) diff --git a/manipulations/iframedefaultsize/iframedefaultsize.go b/manipulations/iframedefaultsize/iframedefaultsize.go index b1a135f..6aaf698 100644 --- a/manipulations/iframedefaultsize/iframedefaultsize.go +++ b/manipulations/iframedefaultsize/iframedefaultsize.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" ) diff --git a/manipulations/iframedefaultsize/iframedefaultsize_test.go b/manipulations/iframedefaultsize/iframedefaultsize_test.go index bf3f745..b5dbb85 100644 --- a/manipulations/iframedefaultsize/iframedefaultsize_test.go +++ b/manipulations/iframedefaultsize/iframedefaultsize_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/imgsize/imgsize.go b/manipulations/imgsize/imgsize.go index 78ad8ee..6c3e2b8 100644 --- a/manipulations/imgsize/imgsize.go +++ b/manipulations/imgsize/imgsize.go @@ -20,10 +20,10 @@ import ( "fmt" "strings" - "github.com/gauntface/go-html-asset-manager/v4/assets/genimgs" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/assets/genimgs" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" ) diff --git a/manipulations/imgsize/imgsize_test.go b/manipulations/imgsize/imgsize_test.go index 4105328..bbd9ee6 100644 --- a/manipulations/imgsize/imgsize_test.go +++ b/manipulations/imgsize/imgsize_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/imgtopicture/imgtopicture.go b/manipulations/imgtopicture/imgtopicture.go index e39ea2d..f67fbb4 100644 --- a/manipulations/imgtopicture/imgtopicture.go +++ b/manipulations/imgtopicture/imgtopicture.go @@ -22,10 +22,10 @@ import ( "strings" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/gauntface/go-html-asset-manager/v4/assets/genimgs" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/assets/genimgs" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" ) diff --git a/manipulations/imgtopicture/imgtopicture_test.go b/manipulations/imgtopicture/imgtopicture_test.go index fd6a4ad..f747b8b 100644 --- a/manipulations/imgtopicture/imgtopicture_test.go +++ b/manipulations/imgtopicture/imgtopicture_test.go @@ -26,10 +26,10 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/gauntface/go-html-asset-manager/v4/assets/genimgs" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/assets/genimgs" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/injectassets/injectassets.go b/manipulations/injectassets/injectassets.go index ba0897d..1d5701f 100644 --- a/manipulations/injectassets/injectassets.go +++ b/manipulations/injectassets/injectassets.go @@ -21,11 +21,11 @@ import ( "fmt" "sort" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" - "github.com/gauntface/go-html-asset-manager/v4/utils/stringui" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/utils/stringui" "golang.org/x/net/html" ) @@ -137,9 +137,10 @@ func addSyncCSS(headNode, bodyNode *html.Node, asset assetmanager.Asset) error { node = bodyNode } - node.AppendChild(htmlparsing.SyncCSSTag(htmlparsing.CSSMediaPair{ - URL: u, - Media: asset.Media(), + node.AppendChild(htmlparsing.SyncCSSTag(htmlparsing.CSSTagData{ + URL: u, + Attributes: asset.Attributes(), + Media: asset.Media(), })) return nil @@ -153,9 +154,10 @@ func addAsyncCSS(headNode, bodyNode *html.Node, asset assetmanager.Asset) error bodyNode.AppendChild( htmlparsing.AsyncCSSTag( - htmlparsing.CSSMediaPair{ - URL: u, - Media: asset.Media(), + htmlparsing.CSSTagData{ + URL: u, + Attributes: asset.Attributes(), + Media: asset.Media(), }, ), ) @@ -186,7 +188,10 @@ func addSyncJS(headNode, bodyNode *html.Node, asset assetmanager.Asset) error { if err != nil { return err } - bodyNode.AppendChild(htmlparsing.SyncJSTag(u)) + bodyNode.AppendChild(htmlparsing.SyncJSTag(htmlparsing.JSTagData{ + URL: u, + Attributes: asset.Attributes(), + })) return nil } @@ -195,7 +200,10 @@ func addAsyncJS(headNode, bodyNode *html.Node, asset assetmanager.Asset) error { if err != nil { return err } - bodyNode.AppendChild(htmlparsing.AsyncJSTag(u)) + bodyNode.AppendChild(htmlparsing.AsyncJSTag(htmlparsing.JSTagData{ + URL: u, + Attributes: asset.Attributes(), + })) return nil } diff --git a/manipulations/injectassets/injectassets_test.go b/manipulations/injectassets/injectassets_test.go index c95b70a..a795cd8 100644 --- a/manipulations/injectassets/injectassets_test.go +++ b/manipulations/injectassets/injectassets_test.go @@ -23,11 +23,11 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetstubs" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetstubs" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) @@ -335,12 +335,29 @@ func TestSyncCSS(t *testing.T) { wantError error }{ { - description: "add asset to head", + description: "add asset to head with url only", asset: &assetstubs.Asset{ URLReturn: "http://example.com/url.css", }, want: ``, }, + { + description: "add asset to head with url and attributes", + asset: &assetstubs.Asset{ + URLReturn: "http://example.com/url.css", + AttributesReturn: []html.Attribute{ + { + Key: "example", + Val: "test", + }, + { + Key: "example-2", + Val: "test-2", + }, + }, + }, + want: ``, + }, } for _, tt := range tests { diff --git a/manipulations/lazyload/lazyload.go b/manipulations/lazyload/lazyload.go index 5781ace..8522336 100644 --- a/manipulations/lazyload/lazyload.go +++ b/manipulations/lazyload/lazyload.go @@ -17,8 +17,8 @@ package lazyload import ( - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" ) diff --git a/manipulations/lazyload/lazyload_test.go b/manipulations/lazyload/lazyload_test.go index f953342..8158c21 100644 --- a/manipulations/lazyload/lazyload_test.go +++ b/manipulations/lazyload/lazyload_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/manipulations.go b/manipulations/manipulations.go index 22b24a9..284b0db 100644 --- a/manipulations/manipulations.go +++ b/manipulations/manipulations.go @@ -22,10 +22,10 @@ import ( "fmt" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/vimeoapi" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/vimeoapi" "golang.org/x/net/html" ) diff --git a/manipulations/opengraphimg/opengraphimg.go b/manipulations/opengraphimg/opengraphimg.go index 8d59639..8956549 100644 --- a/manipulations/opengraphimg/opengraphimg.go +++ b/manipulations/opengraphimg/opengraphimg.go @@ -23,9 +23,9 @@ import ( "strings" "sync" - "github.com/gauntface/go-html-asset-manager/v4/assets/genimgs" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/assets/genimgs" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" ) diff --git a/manipulations/opengraphimg/opengraphimg_test.go b/manipulations/opengraphimg/opengraphimg_test.go index 30480fa..c26949d 100644 --- a/manipulations/opengraphimg/opengraphimg_test.go +++ b/manipulations/opengraphimg/opengraphimg_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/gauntface/go-html-asset-manager/v4/assets/genimgs" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/assets/genimgs" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/ratiowrapper/ratiowrapper.go b/manipulations/ratiowrapper/ratiowrapper.go index f745102..fda4bb7 100644 --- a/manipulations/ratiowrapper/ratiowrapper.go +++ b/manipulations/ratiowrapper/ratiowrapper.go @@ -20,9 +20,9 @@ import ( "fmt" "strconv" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/ratiostyles" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/ratiostyles" "golang.org/x/net/html" ) diff --git a/manipulations/ratiowrapper/ratiowrapper_test.go b/manipulations/ratiowrapper/ratiowrapper_test.go index 7281437..c7044df 100644 --- a/manipulations/ratiowrapper/ratiowrapper_test.go +++ b/manipulations/ratiowrapper/ratiowrapper_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/stripassets/stripassets.go b/manipulations/stripassets/stripassets.go index 69a5687..2408b35 100644 --- a/manipulations/stripassets/stripassets.go +++ b/manipulations/stripassets/stripassets.go @@ -17,8 +17,8 @@ package stripassets import ( - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" ) diff --git a/manipulations/stripassets/stripassets_test.go b/manipulations/stripassets/stripassets_test.go index 265d054..88ac1fe 100644 --- a/manipulations/stripassets/stripassets_test.go +++ b/manipulations/stripassets/stripassets_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/vimeoclean/vimeoclean.go b/manipulations/vimeoclean/vimeoclean.go index 1a6987b..9a4f020 100644 --- a/manipulations/vimeoclean/vimeoclean.go +++ b/manipulations/vimeoclean/vimeoclean.go @@ -26,12 +26,12 @@ import ( "sort" "strings" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/css" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/ratiostyles" - "github.com/gauntface/go-html-asset-manager/v4/utils/vimeoapi" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/css" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/ratiostyles" + "github.com/gauntface/go-html-asset-manager/v5/utils/vimeoapi" "golang.org/x/net/html" ) diff --git a/manipulations/vimeoclean/vimeoclean_test.go b/manipulations/vimeoclean/vimeoclean_test.go index d33ff9c..e5686e3 100644 --- a/manipulations/vimeoclean/vimeoclean_test.go +++ b/manipulations/vimeoclean/vimeoclean_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/config" - "github.com/gauntface/go-html-asset-manager/v4/utils/vimeoapi" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/config" + "github.com/gauntface/go-html-asset-manager/v5/utils/vimeoapi" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/manipulations/youtubeclean/youtubeclean.go b/manipulations/youtubeclean/youtubeclean.go index 986566b..314f679 100644 --- a/manipulations/youtubeclean/youtubeclean.go +++ b/manipulations/youtubeclean/youtubeclean.go @@ -23,10 +23,10 @@ import ( "regexp" "strings" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" - "github.com/gauntface/go-html-asset-manager/v4/utils/css" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/ratiostyles" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/utils/css" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/ratiostyles" "golang.org/x/net/html" ) diff --git a/manipulations/youtubeclean/youtubeclean_test.go b/manipulations/youtubeclean/youtubeclean_test.go index 5537869..2e17362 100644 --- a/manipulations/youtubeclean/youtubeclean_test.go +++ b/manipulations/youtubeclean/youtubeclean_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/manipulations" + "github.com/gauntface/go-html-asset-manager/v5/manipulations" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) diff --git a/preprocessors/hamassets/hamassets.go b/preprocessors/hamassets/hamassets.go index 44d5a53..b929a82 100644 --- a/preprocessors/hamassets/hamassets.go +++ b/preprocessors/hamassets/hamassets.go @@ -1,9 +1,9 @@ package hamassets import ( - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/embedassets" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/embedassets" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors" ) func Preprocessor(runtime preprocessors.Runtime) error { diff --git a/preprocessors/jsonassets/jsonassets.go b/preprocessors/jsonassets/jsonassets.go index 1770614..32b6a31 100644 --- a/preprocessors/jsonassets/jsonassets.go +++ b/preprocessors/jsonassets/jsonassets.go @@ -21,9 +21,10 @@ import ( "errors" "fmt" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors" + "golang.org/x/net/html" ) var ( @@ -38,7 +39,7 @@ func Preprocessor(runtime preprocessors.Runtime) error { return err } - types := map[assets.Type][]string{ + types := map[assets.Type][]htmlAsset{ assets.SyncCSS: remoteURLs.CSS.Sync, assets.AsyncCSS: remoteURLs.CSS.Async, assets.PreloadCSS: remoteURLs.CSS.Preload, @@ -47,9 +48,18 @@ func Preprocessor(runtime preprocessors.Runtime) error { assets.AsyncJS: remoteURLs.JS.Async, assets.PreloadJS: remoteURLs.JS.Preload, } - for t, urls := range types { - for _, u := range urls { - runtime.Assets.AddRemote(assetmanager.NewRemoteAsset(a.ID(), u, t)) + for t, htmlAssets := range types { + for _, ha := range htmlAssets { + attrs := []html.Attribute{} + for _, a := range ha.attributes { + attrs = append(attrs, html.Attribute{ + Key: a.key, + Val: a.value, + }) + } + runtime.Assets.AddRemote( + assetmanager.NewRemoteAsset(a.ID(), ha.src, attrs, t), + ) } } } @@ -76,7 +86,17 @@ type jsonAssets struct { } type jsonAssetGroup struct { - Sync []string - Async []string - Preload []string + Sync []htmlAsset + Async []htmlAsset + Preload []htmlAsset +} + +type htmlAsset struct { + src string `json:"src"` + attributes []htmlAttribute `json:"attributes,omitempty"` +} + +type htmlAttribute struct { + key string + value string } diff --git a/preprocessors/preprocessors.go b/preprocessors/preprocessors.go index 8f9ee19..540ba57 100644 --- a/preprocessors/preprocessors.go +++ b/preprocessors/preprocessors.go @@ -17,8 +17,8 @@ package preprocessors import ( - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" ) type Preprocessor func(runtime Runtime) error diff --git a/preprocessors/revisionassets/revisionassets.go b/preprocessors/revisionassets/revisionassets.go index 73ae948..8b39a19 100644 --- a/preprocessors/revisionassets/revisionassets.go +++ b/preprocessors/revisionassets/revisionassets.go @@ -22,10 +22,10 @@ import ( "os" "path" - "github.com/gauntface/go-html-asset-manager/v4/assets" - "github.com/gauntface/go-html-asset-manager/v4/assets/assetmanager" - "github.com/gauntface/go-html-asset-manager/v4/preprocessors" - "github.com/gauntface/go-html-asset-manager/v4/utils/files" + "github.com/gauntface/go-html-asset-manager/v5/assets" + "github.com/gauntface/go-html-asset-manager/v5/assets/assetmanager" + "github.com/gauntface/go-html-asset-manager/v5/preprocessors" + "github.com/gauntface/go-html-asset-manager/v5/utils/files" ) var ( diff --git a/utils/html/htmlencoding/htmlencoding.go b/utils/html/htmlencoding/htmlencoding.go index aa5ac3f..444f4fd 100644 --- a/utils/html/htmlencoding/htmlencoding.go +++ b/utils/html/htmlencoding/htmlencoding.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlentities" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlentities" "golang.org/x/net/html" ) diff --git a/utils/html/htmlparsing/htmlparsing.go b/utils/html/htmlparsing/htmlparsing.go index 1141d10..70dc3e4 100644 --- a/utils/html/htmlparsing/htmlparsing.go +++ b/utils/html/htmlparsing/htmlparsing.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/gauntface/go-html-asset-manager/v4/utils/sets" + "github.com/gauntface/go-html-asset-manager/v5/utils/sets" "golang.org/x/net/html" ) @@ -60,14 +60,17 @@ func InlineCSSTag(contents string) *html.Node { } } -func SyncCSSTag(cm CSSMediaPair) *html.Node { - attr := []html.Attribute{ +func SyncCSSTag(cm CSSTagData) *html.Node { + attr := cm.Attributes + attr = append(attr, []html.Attribute{ {Key: "href", Val: cm.URL}, {Key: "rel", Val: "stylesheet"}, - } + }...) + if cm.Media != "" { attr = append(attr, html.Attribute{Key: "media", Val: cm.Media}) } + return &html.Node{ Type: html.ElementNode, Data: "link", @@ -75,12 +78,14 @@ func SyncCSSTag(cm CSSMediaPair) *html.Node { } } -func AsyncCSSTag(cm CSSMediaPair) *html.Node { - attr := []html.Attribute{ +func AsyncCSSTag(cm CSSTagData) *html.Node { + attr := cm.Attributes + attr = append(attr, []html.Attribute{ {Key: "href", Val: cm.URL}, {Key: "rel", Val: "stylesheet"}, {Key: "media", Val: "print"}, - } + }...) + if cm.Media != "print" { finalMedia := "all" if cm.Media != "" { @@ -110,25 +115,29 @@ func InlineJSTag(contents string) *html.Node { } } -func SyncJSTag(url string) *html.Node { +func SyncJSTag(jm JSTagData) *html.Node { + attr := jm.Attributes + attr = append(attr, []html.Attribute{ + {Key: "src", Val: jm.URL}, + }...) return &html.Node{ Type: html.ElementNode, Data: "script", - Attr: []html.Attribute{ - {Key: "src", Val: url}, - }, + Attr: attr, } } -func AsyncJSTag(url string) *html.Node { +func AsyncJSTag(jm JSTagData) *html.Node { + attr := jm.Attributes + attr = append(attr, []html.Attribute{ + {Key: "src", Val: jm.URL}, + {Key: "async"}, + {Key: "defer"}, + }...) return &html.Node{ Type: html.ElementNode, Data: "script", - Attr: []html.Attribute{ - {Key: "src", Val: url}, - {Key: "async"}, - {Key: "defer"}, - }, + Attr: attr, } } @@ -221,7 +230,13 @@ func AttributesList(attrs map[string]html.Attribute) []html.Attribute { return attributes } -type CSSMediaPair struct { - URL string - Media string +type CSSTagData struct { + URL string + Attributes []html.Attribute + Media string +} + +type JSTagData struct { + URL string + Attributes []html.Attribute } diff --git a/utils/html/htmlparsing/htmlparsing_test.go b/utils/html/htmlparsing/htmlparsing_test.go index e419ff8..4572193 100644 --- a/utils/html/htmlparsing/htmlparsing_test.go +++ b/utils/html/htmlparsing/htmlparsing_test.go @@ -18,17 +18,14 @@ package htmlparsing import ( "bytes" - "errors" "strings" "testing" - "github.com/gauntface/go-html-asset-manager/v4/utils/sets" + "github.com/gauntface/go-html-asset-manager/v5/utils/sets" "github.com/google/go-cmp/cmp" "golang.org/x/net/html" ) -var errInjected = errors.New("injected error") - func Test_GetKeys(t *testing.T) { tests := []struct { description string @@ -122,19 +119,36 @@ func Test_InlineCSSTag(t *testing.T) { func Test_SyncCSSTag(t *testing.T) { tests := []struct { description string - cm CSSMediaPair + cm CSSTagData want string }{ { - description: "return link tag without media", - cm: CSSMediaPair{ + description: "return basic link tag", + cm: CSSTagData{ URL: "/example.css", }, want: ``, }, + { + description: "return link tag with attributes", + cm: CSSTagData{ + URL: "/example.css", + Attributes: []html.Attribute{ + { + Key: "example", + Val: "test", + }, + { + Key: "example-2", + Val: "test 2", + }, + }, + }, + want: ``, + }, { description: "return link tag with media", - cm: CSSMediaPair{ + cm: CSSTagData{ URL: "/example.css", Media: "print", }, @@ -178,19 +192,38 @@ func Test_InlineJSTag(t *testing.T) { func Test_SyncJSTag(t *testing.T) { tests := []struct { description string - url string + jsData JSTagData want string }{ { - description: "return script tag", - url: "/example.js", - want: ``, + description: "return basic script tag", + jsData: JSTagData{ + URL: "/example.js", + }, + want: ``, + }, + { + description: "return script tag attributes", + jsData: JSTagData{ + URL: "/example.js", + Attributes: []html.Attribute{ + { + Key: "example", + Val: "test", + }, + { + Key: "example-2", + Val: "test 2", + }, + }, + }, + want: ``, }, } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - got := SyncJSTag(tt.url) + got := SyncJSTag(tt.jsData) if diff := cmp.Diff(MustRenderNode(t, got), tt.want); diff != "" { t.Fatalf("Unexpected result; diff %v", diff) } @@ -201,19 +234,38 @@ func Test_SyncJSTag(t *testing.T) { func Test_AsyncJSTag(t *testing.T) { tests := []struct { description string - url string + jsData JSTagData want string }{ { - description: "return script tag", - url: "/example.js", - want: ``, + description: "return basic script tag", + jsData: JSTagData{ + URL: "/example.js", + }, + want: ``, + }, + { + description: "return script tag with attributes", + jsData: JSTagData{ + URL: "/example.js", + Attributes: []html.Attribute{ + { + Key: "example", + Val: "test", + }, + { + Key: "example-2", + Val: "test 2", + }, + }, + }, + want: ``, }, } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - got := AsyncJSTag(tt.url) + got := AsyncJSTag(tt.jsData) if diff := cmp.Diff(MustRenderNode(t, got), tt.want); diff != "" { t.Fatalf("Unexpected result; diff %v", diff) } diff --git a/utils/html/ratiostyles/ratiostyles.go b/utils/html/ratiostyles/ratiostyles.go index 8b9af4e..6c729cf 100644 --- a/utils/html/ratiostyles/ratiostyles.go +++ b/utils/html/ratiostyles/ratiostyles.go @@ -19,7 +19,7 @@ package ratiostyles import ( "fmt" - "github.com/gauntface/go-html-asset-manager/v4/utils/html/htmlparsing" + "github.com/gauntface/go-html-asset-manager/v5/utils/html/htmlparsing" "golang.org/x/net/html" )