diff --git a/go.mod b/go.mod index 2e5147cbc9..5210a6bb7d 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/grafana/k6-cloud-openapi-client-go v0.0.0-20260413092759-f97df3966651 - github.com/grafana/k6provider v0.2.0 + github.com/grafana/k6provider v0.3.0 github.com/grafana/sobek v0.0.0-20260406180825-6d789dcdd177 github.com/grafana/xk6-dashboard-assets v0.1.2 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 @@ -82,7 +82,6 @@ require ( github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6 // indirect - github.com/grafana/k6build v0.5.15 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jhump/protoreflect/v2 v2.0.0-beta.1 // indirect diff --git a/go.sum b/go.sum index 2480079dff..ee9298fe8f 100644 --- a/go.sum +++ b/go.sum @@ -80,12 +80,8 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grafana/k6-cloud-openapi-client-go v0.0.0-20260413092759-f97df3966651 h1:XhXSJzz5D8molo2MjXnzspXKw5/wizwa1hFUYBXh3f4= github.com/grafana/k6-cloud-openapi-client-go v0.0.0-20260413092759-f97df3966651/go.mod h1:RBPBP7qIR/K6qzQEQYESVhp/XJspiBTOyBEBCbPXrvI= -github.com/grafana/k6build v0.5.15 h1:4I5dkAWSMvXsElS1OpLbHj6ZXnebXZGnmwDXy5vcwSQ= -github.com/grafana/k6build v0.5.15/go.mod h1:Sk7SUiCnx2AgkirG3PrCtmJKYL+a8EeRdTzFfbxP0X8= -github.com/grafana/k6foundry v0.4.7 h1:1YXkTBwO/2dSx0pqJrraJATsFlsIX0vEpaEjV7E35w4= -github.com/grafana/k6foundry v0.4.7/go.mod h1:eLsr0whhH+5Y1y7YpDxJi3Jv5wHMuf+80vdRyMH10pg= -github.com/grafana/k6provider v0.2.0 h1:Zu8FBnk6cJyTTkpCA+y+Ravc2YFeAQjsIfPpcbZtfB0= -github.com/grafana/k6provider v0.2.0/go.mod h1:TJ6vzPm4yDQ2ji/Fet0dFOpdjktrKZp4hsnLZhRoZVA= +github.com/grafana/k6provider v0.3.0 h1:Sw3CX4RaCmsW8fc3frDv+Mj4IcrIz7NfMMf9FJEYtrM= +github.com/grafana/k6provider v0.3.0/go.mod h1:R9WKthnwk96E47m6w/mnC13hhBYTn5iMdP5caFt/t5k= github.com/grafana/sobek v0.0.0-20260406180825-6d789dcdd177 h1:0OMR7GLMuIoXDyXWKD4+ySHckqjgIpo0ZJ3iMA4Em4c= github.com/grafana/sobek v0.0.0-20260406180825-6d789dcdd177/go.mod h1:YtuqiJX1W3XvRSilL/kUZzduJG3phPJWyzM9DiIEfBo= github.com/grafana/xk6-dashboard-assets v0.1.2 h1:n2wqytPICn2ZYsKa9HE6GlvFXk+WjByMfT4eM+ms3gE= @@ -251,8 +247,6 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= -golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/vendor/github.com/grafana/k6build/Dockerfile b/vendor/github.com/grafana/k6build/Dockerfile deleted file mode 100644 index 5b44568276..0000000000 --- a/vendor/github.com/grafana/k6build/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -ARG GO_VERSION=1.24.4 -ARG VARIANT=bookworm -FROM golang:${GO_VERSION}-${VARIANT} as builder - -WORKDIR /build - -COPY . . - -ARG GOFLAGS="-ldflags=-w -ldflags=-s" -RUN CGO_ENABLED=0 go build -o k6build -trimpath ./cmd/k6build/main.go - -# k6build server requires golang toolchain -FROM golang:${GO_VERSION}-${VARIANT} - -RUN addgroup --gid 1000 k6build && \ - adduser --uid 1000 --ingroup k6build \ - --home /home/k6build --shell /bin/sh \ - --disabled-password --gecos "" k6build - -COPY --from=builder /build/k6build /usr/local/bin/ - -WORKDIR /home/k6build - -USER k6build - -ENTRYPOINT ["/usr/local/bin/k6build"] diff --git a/vendor/github.com/grafana/k6build/LICENSE b/vendor/github.com/grafana/k6build/LICENSE deleted file mode 100644 index 0ad25db4bd..0000000000 --- a/vendor/github.com/grafana/k6build/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/vendor/github.com/grafana/k6build/build.go b/vendor/github.com/grafana/k6build/build.go deleted file mode 100644 index 6c21973420..0000000000 --- a/vendor/github.com/grafana/k6build/build.go +++ /dev/null @@ -1,76 +0,0 @@ -// Package k6build defines a service for building k6 binaries -package k6build - -import ( - "bytes" - "context" - "errors" - "fmt" -) - -var ErrBuildFailed = errors.New("build failed") //nolint:revive - -// Dependency defines a dependency and its semantic version constrains -type Dependency struct { - // Name is the name of the dependency. - Name string `json:"name,omitempty"` - // Constraints specifies the semantic version constraints. E.g. >v0.2.0 - Constraints string `json:"constraints,omitempty"` -} - -// Artifact defines the metadata of binary that satisfies a set of dependencies -// including a URL for downloading it. -type Artifact struct { - // Unique id. Binaries satisfying the same set of dependencies have the same ID - ID string `json:"id,omitempty"` - // URL to fetch the artifact's binary - URL string `json:"url,omitempty"` - // List of dependencies that the artifact provides - Dependencies map[string]string `json:"dependencies,omitempty"` - // platform - Platform string `json:"platform,omitempty"` - // binary checksum (sha256) - Checksum string `json:"checksum,omitempty"` -} - -// String returns a text serialization of the Artifact -func (a Artifact) String() string { - return a.toString(true, " ") -} - -// Print returns a string with a pretty print of the artifact -func (a Artifact) Print() string { - return a.toString(true, "\n") -} - -// PrintSummary returns a string with a pretty print of the artifact -func (a Artifact) PrintSummary() string { - return a.toString(false, "\n") -} - -// Print returns a text serialization of the Artifact -func (a Artifact) toString(details bool, sep string) string { - buffer := &bytes.Buffer{} - if details { - buffer.WriteString(fmt.Sprintf("id: %s%s", a.ID, sep)) - } - buffer.WriteString(fmt.Sprintf("platform: %s%s", a.Platform, sep)) - for dep, version := range a.Dependencies { - buffer.WriteString(fmt.Sprintf("%s:%q%s", dep, version, sep)) - } - buffer.WriteString(fmt.Sprintf("checksum: %s%s", a.Checksum, sep)) - if details { - buffer.WriteString(fmt.Sprintf("url: %s%s", a.URL, sep)) - } - return buffer.String() -} - -// BuildService defines the interface for building custom k6 binaries -type BuildService interface { - // Build returns a k6 Artifact that satisfies a set dependencies and version constrains. - Build(ctx context.Context, platform string, k6Constrains string, deps []Dependency) (Artifact, error) - - // Resolve returns the versions that satisfy the given dependency constrains or an error if they - // cannot be satisfied - Resolve(ctx context.Context, k6Constrains string, deps []Dependency) (map[string]string, error) -} diff --git a/vendor/github.com/grafana/k6build/pkg/api/api.go b/vendor/github.com/grafana/k6build/pkg/api/api.go deleted file mode 100644 index 77beab0ae6..0000000000 --- a/vendor/github.com/grafana/k6build/pkg/api/api.go +++ /dev/null @@ -1,98 +0,0 @@ -// Package api defines the interface to a build service -package api - -import ( - "bytes" - "errors" - "fmt" - - "github.com/grafana/k6build" -) - -var ( - // ErrBuildFailed signals the build process failed - ErrBuildFailed = errors.New("build failed") - // ErrCannotSatisfy signals the dependency constrains cannot be satisfied - ErrCannotSatisfy = errors.New("cannot satisfy dependency") - // ErrInvalidRequest signals the request could not be processed - // due to erroneous parameters - ErrInvalidRequest = errors.New("invalid request") - // ErrRequestFailed signals the request failed, probably due to a network error - ErrRequestFailed = errors.New("request failed") - // ErrResolveFailed signals the resolve request failed - ErrResolveFailed = errors.New("resolve failed") -) - -// BuildRequest defines a request to the build service -type BuildRequest struct { - K6Constrains string `json:"k6,omitempty"` - Dependencies []k6build.Dependency `json:"dependencies,omitempty"` - Platform string `json:"platform,omitempty"` -} - -// BuildResponse defines the response for a BuildRequest -type BuildResponse struct { - // If not empty an error occurred processing the request - // This Error can be compared to the errors defined in this package using errors.Is - // to know the type of error, and use Unwrap to obtain its cause if available. - Error *k6build.WrappedError `json:"error,omitempty"` - // Artifact metadata. If an error occurred, content is undefined - Artifact k6build.Artifact `json:"artifact,omitempty"` -} - -// String returns a text serialization of the BuildRequest -func (r BuildRequest) String() string { - buffer := &bytes.Buffer{} - buffer.WriteString(fmt.Sprintf("platform: %s", r.Platform)) - buffer.WriteString(fmt.Sprintf("k6: %s", r.K6Constrains)) - for _, d := range r.Dependencies { - buffer.WriteString(fmt.Sprintf("%s:%q", d.Name, d.Constraints)) - } - return buffer.String() -} - -// String returns a text serialization of the BuildResponse -func (r BuildResponse) String() string { - buffer := &bytes.Buffer{} - buffer.WriteString(fmt.Sprintf("artifact: %s", r.Artifact.String())) - return buffer.String() -} - -// ResolveRequest defines a request to the build service for validating if the dependency -// constrains can be satisfied -type ResolveRequest struct { - K6Constrains string `json:"k6,omitempty"` - Dependencies []k6build.Dependency `json:"dependencies,omitempty"` -} - -// ResolveResponse defines the response for a ResolveRequest -type ResolveResponse struct { - // If not empty an error occurred processing the request - // This Error can be compared to the errors defined in this package using errors.Is - // to know the type of error, and use Unwrap to obtain its cause if available. - Error *k6build.WrappedError `json:"error,omitempty"` - // List of version that satisfies the dependencies - Dependencies map[string]string `json:"dependencies,omitempty"` -} - -// String returns a text serialization of the ResolveRequest -func (r ResolveRequest) String() string { - buffer := &bytes.Buffer{} - buffer.WriteString(fmt.Sprintf("k6: %s", r.K6Constrains)) - for _, d := range r.Dependencies { - buffer.WriteString(fmt.Sprintf("%s:%q", d.Name, d.Constraints)) - } - return buffer.String() -} - -// String returns a text serialization of the BuildResponse -func (r ResolveResponse) String() string { - buffer := &bytes.Buffer{} - if r.Error != nil { - buffer.WriteString(fmt.Sprintf("error: %s", r.Error.Error())) - } - for dep, version := range r.Dependencies { - buffer.WriteString(fmt.Sprintf("%s:%q ", dep, version)) - } - return buffer.String() -} diff --git a/vendor/github.com/grafana/k6build/pkg/client/client.go b/vendor/github.com/grafana/k6build/pkg/client/client.go deleted file mode 100644 index 1c55590d57..0000000000 --- a/vendor/github.com/grafana/k6build/pkg/client/client.go +++ /dev/null @@ -1,261 +0,0 @@ -// Package client implements a client for a build service -package client - -import ( - "bytes" - "context" - "encoding/json" - "errors" - "fmt" - "io" - "net" - "net/http" - "net/url" - "time" - - "github.com/grafana/k6build" - "github.com/grafana/k6build/pkg/api" -) - -// ErrInvalidConfiguration signals an error in the configuration -var ErrInvalidConfiguration = errors.New("invalid configuration") - -const ( - defaultAuthType = "Bearer" - buildPath = "build" - resolvePath = "resolve" - - // DefaultRetries number of retries for requests - DefaultRetries = 3 - // DefaultBackoff initial backoff time between retries. It is incremented exponentially between retries. - DefaultBackoff = 1 * time.Second -) - -// BuildServiceClientConfig defines the configuration for accessing a remote build service -type BuildServiceClientConfig struct { - // URL to build service - URL string - // Authorization credentials passed in the Authorization: header - // See AuthorizationType - Authorization string - // AuthorizationType type of credentials in the Authorization: header - // For example, "Bearer", "Token", "Basic". Defaults to "Bearer" - AuthorizationType string - // Headers custom request headers - Headers map[string]string - // HTTPClient custom http client - HTTPClient *http.Client - // Retries number of retries for requests. Default to 3 - Retries int - // Backoff initial backoff time between retries. Default to 1s - // It is incremented exponentially between retries: 1s, 2s, 4s... - Backoff time.Duration -} - -// NewBuildServiceClient returns a new client for a remote build service -func NewBuildServiceClient(config BuildServiceClientConfig) (k6build.BuildService, error) { - if config.URL == "" { - return nil, ErrInvalidConfiguration - } - - srvURL, err := url.Parse(config.URL) - if err != nil { - return nil, fmt.Errorf("invalid server %w", err) - } - - client := config.HTTPClient - if client == nil { - client = http.DefaultClient - } - return &BuildClient{ - srvURL: srvURL, - auth: config.Authorization, - authType: config.AuthorizationType, - headers: config.Headers, - client: client, - retries: config.Retries, - backoff: config.Backoff, - }, nil -} - -// BuildClient defines a client of a build service -type BuildClient struct { - srvURL *url.URL - authType string - auth string - headers map[string]string - client *http.Client - retries int - backoff time.Duration -} - -// Build request building an artifact to a build service -// The build service is expected to return a k6build.Artifact -// In case of error, the returned error is expected to match any of the errors -// defined in the api package and calling errors.Unwrap(err) will provide -// the cause, if available. -func (r *BuildClient) Build( - ctx context.Context, - platform string, - k6Constrains string, - deps []k6build.Dependency, -) (k6build.Artifact, error) { - buildRequest := api.BuildRequest{ - Platform: platform, - K6Constrains: k6Constrains, - Dependencies: deps, - } - - buildResponse := api.BuildResponse{} - - err := r.doRequest(ctx, buildPath, &buildRequest, &buildResponse) - if err != nil { - return k6build.Artifact{}, err - } - - if buildResponse.Error != nil { - return k6build.Artifact{}, buildResponse.Error - } - - return buildResponse.Artifact, nil -} - -// Resolve returns the versions that satisfy the given dependencies or an error if they cannot be -// satisfied -func (r *BuildClient) Resolve( - ctx context.Context, - k6Constrains string, - deps []k6build.Dependency, -) (map[string]string, error) { - resolveRequest := api.ResolveRequest{ - K6Constrains: k6Constrains, - Dependencies: deps, - } - - resolveResponse := api.ResolveResponse{} - - err := r.doRequest(ctx, resolvePath, &resolveRequest, &resolveResponse) - if err != nil { - return nil, err - } - - if resolveResponse.Error != nil { - return nil, resolveResponse.Error - } - - return resolveResponse.Dependencies, nil -} - -func (r *BuildClient) doRequest(ctx context.Context, path string, request any, response any) error { - marshaled := &bytes.Buffer{} - err := json.NewEncoder(marshaled).Encode(request) - if err != nil { - return k6build.NewWrappedError(api.ErrInvalidRequest, err) - } - - reqURL := r.srvURL.JoinPath(path) - req, err := http.NewRequestWithContext(ctx, http.MethodPost, reqURL.String(), marshaled) - if err != nil { - return k6build.NewWrappedError(api.ErrRequestFailed, err) - } - req.Header.Add("Content-Type", "application/json") - - // add authorization header "Authorization: " - if r.auth != "" { - authType := r.authType - if authType == "" { - authType = defaultAuthType - } - req.Header.Add("Authorization", fmt.Sprintf("%s %s", authType, r.auth)) - } - - // add custom headers - for h, v := range r.headers { - req.Header.Add(h, v) - } - - var ( - resp *http.Response - backoff = r.backoff - retries = r.retries - ) - - if retries == 0 { - retries = DefaultRetries - } - - if backoff == 0 { - backoff = DefaultBackoff - } - - // preserve body for retries - body, err := io.ReadAll(req.Body) - if err != nil { - return k6build.NewWrappedError(api.ErrRequestFailed, err) - } - - // close the original body, we don't need it anymore - err = req.Body.Close() - if err != nil { - return k6build.NewWrappedError(api.ErrRequestFailed, err) - } - - // try at least once - for { - req.Body = io.NopCloser(bytes.NewReader(body)) // reset the body - resp, err = r.client.Do(req) - - if retries == 0 || !shouldRetry(err, resp) { - break - } - - time.Sleep(backoff) - - // increase backoff exponentially for next retry - backoff *= 2 - retries-- - } - - if err != nil { - return k6build.NewWrappedError(api.ErrRequestFailed, err) - } - - defer func() { - _ = resp.Body.Close() - }() - - if resp.StatusCode != http.StatusOK { - return k6build.NewWrappedError(api.ErrRequestFailed, errors.New(resp.Status)) - } - - err = json.NewDecoder(resp.Body).Decode(&response) - if err != nil { - return k6build.NewWrappedError(api.ErrRequestFailed, err) - } - - return nil -} - -// shouldRetry returns true if the error or response indicates that the request should be retried -func shouldRetry(err error, resp *http.Response) bool { - if err != nil { - if errors.Is(err, io.EOF) { // assuming EOF is due to connection interrupted by network error - return true - } - - var ne net.Error - if errors.As(err, &ne) { - return ne.Timeout() - } - - return false - } - - if resp.StatusCode == http.StatusServiceUnavailable || - resp.StatusCode == http.StatusBadGateway || - resp.StatusCode == http.StatusGatewayTimeout { - return true - } - - return false -} diff --git a/vendor/github.com/grafana/k6provider/client.go b/vendor/github.com/grafana/k6provider/client.go new file mode 100644 index 0000000000..895eb65e12 --- /dev/null +++ b/vendor/github.com/grafana/k6provider/client.go @@ -0,0 +1,134 @@ +package k6provider + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "net/http" + "net/url" +) + +const ( + defaultAuthType = "Bearer" + buildPath = "build" +) + +// dependency defines a dependency and its semantic version constraints +type dependency struct { + Name string `json:"name,omitempty"` + Constraints string `json:"constraints,omitempty"` +} + +// buildArtifact is the artifact returned by the build service (internal representation) +type buildArtifact struct { + ID string `json:"id,omitempty"` + URL string `json:"url,omitempty"` + Dependencies map[string]string `json:"dependencies,omitempty"` + Platform string `json:"platform,omitempty"` + Checksum string `json:"checksum,omitempty"` +} + +// buildRequest defines a request to the build service +type buildRequest struct { + K6Constraints string `json:"k6,omitempty"` + Dependencies []dependency `json:"dependencies,omitempty"` + Platform string `json:"platform,omitempty"` +} + +// buildResponse defines the response for a BuildRequest +type buildResponse struct { + Error *WrappedError `json:"error,omitempty"` + Artifact buildArtifact `json:"artifact"` +} + +// buildClient builds custom k6 binaries via HTTP +type buildClient struct { + srvURL *url.URL + auth string + authType string + headers map[string]string +} + +func newBuildServiceClient( + urlStr, authorization, authorizationType string, headers map[string]string, +) (*buildClient, error) { + srvURL, err := url.Parse(urlStr) + if err != nil { + return nil, NewWrappedError(ErrConfig, fmt.Errorf("invalid server URL: %w", err)) + } + + authType := authorizationType + if authType == "" { + authType = defaultAuthType + } + + return &buildClient{ + srvURL: srvURL, + auth: authorization, + authType: authType, + headers: headers, + }, nil +} + +func (r *buildClient) Build( + ctx context.Context, + platform string, + k6Constraints string, + deps []dependency, +) (buildArtifact, error) { + req := buildRequest{ + Platform: platform, + K6Constraints: k6Constraints, + Dependencies: deps, + } + + var resp buildResponse + if err := r.doRequest(ctx, buildPath, &req, &resp); err != nil { + return buildArtifact{}, err + } + if resp.Error != nil { + return buildArtifact{}, resp.Error + } + return resp.Artifact, nil +} + +func (r *buildClient) doRequest(ctx context.Context, path string, request, response any) error { + marshaled := &bytes.Buffer{} + if err := json.NewEncoder(marshaled).Encode(request); err != nil { + return NewWrappedError(ErrBuild, err) + } + + reqURL := r.srvURL.JoinPath(path) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, reqURL.String(), marshaled) + if err != nil { + return NewWrappedError(ErrBuild, err) + } + req.Header.Set("Content-Type", "application/json") + + if r.auth != "" { + req.Header.Set("Authorization", fmt.Sprintf("%s %s", r.authType, r.auth)) + } + + for h, v := range r.headers { + req.Header.Set(h, v) + } + + resp, err := http.DefaultClient.Do(req) //nolint:gosec // G704: URL is from build service config, not user input + if err != nil { + return NewWrappedError(ErrBuild, err) + } + defer func() { + _ = resp.Body.Close() + }() + + if resp.StatusCode != http.StatusOK { + return NewWrappedError(ErrBuild, fmt.Errorf("status %s", resp.Status)) + } + + if err := json.NewDecoder(resp.Body).Decode(response); err != nil { + return NewWrappedError(ErrBuild, err) + } + + return nil +} diff --git a/vendor/github.com/grafana/k6provider/download.go b/vendor/github.com/grafana/k6provider/download.go index 4bd9bb2f48..6f588ba05f 100644 --- a/vendor/github.com/grafana/k6provider/download.go +++ b/vendor/github.com/grafana/k6provider/download.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "io" + "log/slog" "net" "net/http" "net/url" @@ -52,15 +53,16 @@ type downloader struct { headers map[string]string retries int backoff time.Duration + logger *slog.Logger } // newDownloader returns a new Downloader -func newDownloader(config DownloadConfig) (*downloader, error) { +func newDownloader(config DownloadConfig, logger *slog.Logger) (*downloader, error) { httpClient := http.DefaultClient proxyURL := config.ProxyURL if proxyURL == "" { - proxyURL = os.Getenv("K6_DOWNLOAD_PROXY") + proxyURL = os.Getenv("K6_DOWNLOAD_PROXY") //nolint:forbidigo } if proxyURL != "" { parsed, err := url.Parse(proxyURL) @@ -74,14 +76,13 @@ func newDownloader(config DownloadConfig) (*downloader, error) { downloadAuth := config.Authorization if downloadAuth == "" { - downloadAuth = os.Getenv("K6_DOWNLOAD_AUTH") + downloadAuth = os.Getenv("K6_DOWNLOAD_AUTH") //nolint:forbidigo } downloadAuthType := config.AuthType if downloadAuthType == "" { downloadAuthType = "Bearer" } - return &downloader{ client: httpClient, auth: downloadAuth, @@ -89,14 +90,15 @@ func newDownloader(config DownloadConfig) (*downloader, error) { headers: config.Headers, retries: config.Retries, backoff: config.Backoff, + logger: logger, }, nil } func (d *downloader) download(ctx context.Context, from string, path string, checksum string) error { downloadBin := path + ".download" - dest, err := os.OpenFile( //nolint:gosec + dest, err := os.OpenFile( //nolint:gosec,forbidigo downloadBin, - os.O_TRUNC|os.O_WRONLY|os.O_CREATE, + os.O_TRUNC|os.O_WRONLY|os.O_CREATE, //nolint:forbidigo syscall.S_IRUSR|syscall.S_IXUSR|syscall.S_IWUSR, ) if err != nil { @@ -138,12 +140,17 @@ func (d *downloader) download(ctx context.Context, from string, path string, che // try at least once for { // it is safe to reuse the request as it doesn't have a body - resp, err = d.client.Do(req) + resp, err = d.client.Do(req) //nolint:gosec // G704: URL is from artifact, not user input if retries == 0 || !shouldRetry(err, resp) { break } + d.logger.Debug("Download retry", + "retries_left", retries, + "backoff", backoff, + "error", err, + ) time.Sleep(backoff) // increase backoff exponentially for next retry @@ -180,7 +187,7 @@ func (d *downloader) download(ctx context.Context, from string, path string, che return fmt.Errorf("downloaded content checksum mismatch") } - err = os.Rename(downloadBin, path) + err = os.Rename(downloadBin, path) //nolint:forbidigo return err } diff --git a/vendor/github.com/grafana/k6build/error.go b/vendor/github.com/grafana/k6provider/errors.go similarity index 59% rename from vendor/github.com/grafana/k6build/error.go rename to vendor/github.com/grafana/k6provider/errors.go index 98d0ca73a5..5ba22abab6 100644 --- a/vendor/github.com/grafana/k6build/error.go +++ b/vendor/github.com/grafana/k6provider/errors.go @@ -1,4 +1,4 @@ -package k6build +package k6provider import ( "encoding/json" @@ -6,17 +6,13 @@ import ( "fmt" ) -// ErrReasonUnknown signals the reason for an WrappedError is unknown -var ErrReasonUnknown = errors.New("reason unknown") +var errReasonUnknown = errors.New("reason unknown") -// WrappedError represents an error returned by the build service +// WrappedError represents an error returned by the build service. // This custom error type facilitates extracting the reason of an error // by using errors.Unwrap method. // It also facilitates checking an error (or its reason) using errors.Is by // comparing the error and its reason. -// This custom type has the following known limitations: -// - A nil WrappedError 'e' will not satisfy errors.Is(e, nil) -// - Is method will not type WrappedError struct { Err error `json:"error,omitempty"` Reason error `json:"reason,omitempty"` @@ -24,20 +20,27 @@ type WrappedError struct { // Error returns the Error as a string func (e *WrappedError) Error() string { - return fmt.Sprintf("%s: %s", e.Err, e.Reason) + if e == nil { + return "" + } + errStr := "" + if e.Err != nil { + errStr = e.Err.Error() + } + reasonStr := "" + if e.Reason != nil { + reasonStr = e.Reason.Error() + } + return fmt.Sprintf("%s: %s", errStr, reasonStr) } // Is returns true if the target error is the same as the WrappedError or its reason -// It attempts several strategies: -// - compare error and reason to target's Error() -// - unwrap the error and reason and compare to target's WrappedError -// - unwrap target and compares to the error recursively func (e *WrappedError) Is(target error) bool { - if target == nil { + if e == nil || target == nil { return false } - if e.Err.Error() == target.Error() { + if e.Err != nil && e.Err.Error() == target.Error() { return true } @@ -45,12 +48,16 @@ func (e *WrappedError) Is(target error) bool { return true } - if u := errors.Unwrap(e.Err); u != nil && u.Error() == target.Error() { - return true + if e.Err != nil { + if u := errors.Unwrap(e.Err); u != nil && u.Error() == target.Error() { + return true + } } - if u := errors.Unwrap(e.Reason); u != nil && u.Error() == target.Error() { - return true + if e.Reason != nil { + if u := errors.Unwrap(e.Reason); u != nil && u.Error() == target.Error() { + return true + } } return e.Is(errors.Unwrap(target)) @@ -66,7 +73,7 @@ type jsonError struct { Reason *jsonError `json:"reason,omitempty"` } -func wrap(e *jsonError) error { +func wrapJSONError(e *jsonError) error { if e == nil { return nil } @@ -75,25 +82,25 @@ func wrap(e *jsonError) error { return err } - return NewWrappedError(err, wrap(e.Reason)) + return NewWrappedError(err, wrapJSONError(e.Reason)) } -func unwrap(e error) *jsonError { +func unwrapToJSON(e error) *jsonError { if e == nil { return nil } - err, ok := AsError(e) + err, ok := AsWrappedError(e) if !ok { return &jsonError{Err: e.Error()} } - return &jsonError{Err: err.Err.Error(), Reason: unwrap(errors.Unwrap(err))} + return &jsonError{Err: err.Err.Error(), Reason: unwrapToJSON(errors.Unwrap(err))} } // MarshalJSON implements the json.Marshaler interface for the WrappedError type func (e *WrappedError) MarshalJSON() ([]byte, error) { - return json.Marshal(unwrap(e)) + return json.Marshal(unwrapToJSON(e)) } // UnmarshalJSON implements the json.Unmarshaler interface for the WrappedError type @@ -105,15 +112,15 @@ func (e *WrappedError) UnmarshalJSON(data []byte) error { } e.Err = errors.New(val.Err) - e.Reason = wrap(val.Reason) + e.Reason = wrapJSONError(val.Reason) return nil } -// NewWrappedError creates an Error from an error and a reason -// If the reason is nil, ErrReasonUnknown is used +// NewWrappedError creates an Error from an error and a reason. +// If the reason is nil, errReasonUnknown is used. func NewWrappedError(err error, reason error) *WrappedError { if reason == nil { - reason = ErrReasonUnknown + reason = errReasonUnknown } return &WrappedError{ Err: err, @@ -121,8 +128,8 @@ func NewWrappedError(err error, reason error) *WrappedError { } } -// AsError returns an error as an Error, if possible -func AsError(e error) (*WrappedError, bool) { +// AsWrappedError returns an error as a WrappedError, if possible +func AsWrappedError(e error) (*WrappedError, bool) { err := &WrappedError{} if !errors.As(e, &err) { return nil, false diff --git a/vendor/github.com/grafana/k6provider/k6binary.go b/vendor/github.com/grafana/k6provider/k6binary.go index 62459ac658..f6296e51c9 100644 --- a/vendor/github.com/grafana/k6provider/k6binary.go +++ b/vendor/github.com/grafana/k6provider/k6binary.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package k6provider diff --git a/vendor/github.com/grafana/k6provider/lock_nix.go b/vendor/github.com/grafana/k6provider/lock_nix.go index 96de5fdaa0..7b86600d10 100644 --- a/vendor/github.com/grafana/k6provider/lock_nix.go +++ b/vendor/github.com/grafana/k6provider/lock_nix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package k6provider diff --git a/vendor/github.com/grafana/k6provider/provider.go b/vendor/github.com/grafana/k6provider/provider.go index 0eee901628..26bdb2d67b 100644 --- a/vendor/github.com/grafana/k6provider/provider.go +++ b/vendor/github.com/grafana/k6provider/provider.go @@ -8,14 +8,13 @@ import ( "encoding/base64" "errors" "fmt" + "io" + "log/slog" "net/http" "os" "path/filepath" "runtime" "time" - - "github.com/grafana/k6build" - "github.com/grafana/k6build/pkg/client" ) const ( @@ -38,52 +37,6 @@ var ( ErrPruningCache = errors.New("pruning cache") ) -// WrappedError defines a custom error type that allows creating an error -// specifying its cause. -// -// This type is compatible with the error interface. -// -// Contrary to the error wrapping mechanism provided by the standard library -// the cause can be extracted using the unwrap() method. -// -// WrappedError also implements the Is method to that it can compare to an error -// based on the result of the Error() method, overcoming a limitation of the error -// implemented in the stdlib. -// -// Example: -// var ( -// err = errors.New("error") -// root = errors.New("root cause") -// cause = NewWrappedError(cause, root) -// ferr = fmt.Errorf("%w %w", err, cause) -// werr = NewWrappedError(err,) -// target = errors.New("error") -// ) -// -// errors.Is(werr, err) // returns true -// errors.Is(werr, cause) // returns true -// errors.Is(werr, root) // return true -// errors.Is(err, target) // returns false (err != target) -// errors.Is(werr, target) // returns true (err.Error() == target.Error()) -// ferr.Unwrap() // return nil -// werr.Unwrap() // return cause -// werr.Unwrap().Unwrap() // return root -type WrappedError = *k6build.WrappedError - -// NewWrappedError return a new [WrappedError] from an error and its reason -func NewWrappedError(err error, reason error) WrappedError { - return k6build.NewWrappedError(err, reason) -} - -// AsWrappedError returns and error as a [WrapperError] and a boolean indicating if it was possible -func AsWrappedError(err error) (WrappedError, bool) { - buildErr := &k6build.WrappedError{} - if !errors.As(err, &buildErr) { - return nil, false - } - return buildErr, true -} - // K6Binary defines the attributes of a k6 binary type K6Binary struct { // Path to the binary @@ -103,7 +56,7 @@ type K6Binary struct { func (b K6Binary) UnmarshalDeps() string { buffer := &bytes.Buffer{} for dep, version := range b.Dependencies { - buffer.WriteString(fmt.Sprintf("%s:%q;", dep, version)) + fmt.Fprintf(buffer, "%s:%q;", dep, version) } return buffer.String() } @@ -145,7 +98,7 @@ type Config struct { } // Dependencies defines a group of dependencies with their version constrains -// For example, {"k6": "*", "k6/x/sql", ">v0.4.0"} +// For example, {"k6": "*", "k6/x/sql": ">v0.4.0"} type Dependencies map[string]string // Provider implements an interface for providing custom k6 binaries @@ -156,9 +109,10 @@ type Provider struct { client *http.Client downloader *downloader binDir string - buildSrv k6build.BuildService + buildSrv *buildClient platform string pruner *Pruner + logger *slog.Logger } // NewDefaultProvider returns a Provider with default settings @@ -171,6 +125,16 @@ func NewDefaultProvider() (*Provider, error) { // NewProvider returns a [Provider] with the given Config func NewProvider(config Config) (*Provider, error) { + return NewProviderWithLogger(config, nil) +} + +// NewProviderWithLogger returns a [Provider] with the given Config and logger. +// If logger is nil, a discard logger is used. +func NewProviderWithLogger(config Config, logger *slog.Logger) (*Provider, error) { + if logger == nil { + logger = slog.New(slog.NewTextHandler(io.Discard, nil)) + } + var err error // try first deprecated BinDir @@ -179,12 +143,12 @@ func NewProvider(config Config) (*Provider, error) { binDir = config.BinaryCacheDir } if binDir == "" { - binDir = os.Getenv("K6_BINARY_CACHE") + binDir = os.Getenv("K6_BINARY_CACHE") //nolint:forbidigo } if binDir == "" { - cacheDir, err := os.UserCacheDir() + cacheDir, err := os.UserCacheDir() //nolint:forbidigo if err != nil { - cacheDir = os.TempDir() + cacheDir = os.TempDir() //nolint:forbidigo } binDir = filepath.Join(cacheDir, "k6provider") } @@ -195,7 +159,7 @@ func NewProvider(config Config) (*Provider, error) { cacheSize = config.BinaryCacheSize } if cacheSize == 0 { - cacheSize, err = parseSize(os.Getenv("K6_BINARY_CACHE_SIZE")) + cacheSize, err = parseSize(os.Getenv("K6_BINARY_CACHE_SIZE")) //nolint:forbidigo if err != nil { return nil, NewWrappedError(ErrConfig, err) } @@ -205,7 +169,7 @@ func NewProvider(config Config) (*Provider, error) { buildSrvURL := config.BuildServiceURL if buildSrvURL == "" { - buildSrvURL = os.Getenv("K6_BUILD_SERVICE_URL") + buildSrvURL = os.Getenv("K6_BUILD_SERVICE_URL") //nolint:forbidigo } if buildSrvURL == "" { return nil, NewWrappedError(ErrConfig, fmt.Errorf("build service URL is required")) @@ -213,17 +177,11 @@ func NewProvider(config Config) (*Provider, error) { buildSrvAuth := config.BuildServiceAuth if buildSrvAuth == "" { - buildSrvAuth = os.Getenv("K6_BUILD_SERVICE_AUTH") + buildSrvAuth = os.Getenv("K6_BUILD_SERVICE_AUTH") //nolint:forbidigo } - buildSrv, err := client.NewBuildServiceClient( - client.BuildServiceClientConfig{ - URL: buildSrvURL, - Authorization: buildSrvAuth, - AuthorizationType: config.BuildServiceAuthType, - Headers: config.BuildServiceHeaders, - }, - ) + buildSrv, err := newBuildServiceClient( + buildSrvURL, buildSrvAuth, config.BuildServiceAuthType, config.BuildServiceHeaders) if err != nil { return nil, NewWrappedError(ErrConfig, err) } @@ -238,18 +196,21 @@ func NewProvider(config Config) (*Provider, error) { pruneInterval = defaultPruneInterval } - downloader, err := newDownloader(config.DownloadConfig) + downloader, err := newDownloader(config.DownloadConfig, logger) if err != nil { return nil, NewWrappedError(ErrConfig, err) } + pruner := NewPrunerWithLogger(binDir, cacheSize, pruneInterval, logger) + return &Provider{ client: httpClient, downloader: downloader, binDir: binDir, buildSrv: buildSrv, platform: platform, - pruner: NewPruner(binDir, cacheSize, pruneInterval), + pruner: pruner, + logger: logger, }, nil } @@ -276,6 +237,10 @@ func (p *Provider) GetArtifact( ) (Artifact, error) { k6Constrains, buildDeps := buildDeps(deps) + p.logger.Debug("Resolving k6 artifact", + "deps", deps, + "platform", p.platform, + ) artifact, err := p.buildSrv.Build(ctx, p.platform, k6Constrains, buildDeps) if err != nil { if !errors.Is(err, ErrInvalidParameters) { @@ -303,13 +268,20 @@ func (p *Provider) GetArtifact( } checksum = fmt.Sprintf("%x", decoded) } - return Artifact{ + + resolved := Artifact{ ID: artifact.ID, URL: artifact.URL, Dependencies: artifact.Dependencies, Platform: artifact.Platform, Checksum: checksum, - }, nil + } + p.logger.Debug("Artifact resolved", + "artifact_id", resolved.ID, + "deps", resolved.Dependencies, + "url", resolved.URL, + ) + return resolved, nil } // GetBinary returns a custom k6 binary that satisfies the given a set of dependencies. @@ -327,10 +299,7 @@ func (p *Provider) GetArtifact( // If any error occurs while building, downloading or checking the binary, // an [WrappedError] will be returned. This error will be one of the errors // defined in the k6provider packaged. Using errors.Unwrap will return its cause. -func (p *Provider) GetBinary( - ctx context.Context, - constrains Dependencies, -) (K6Binary, error) { +func (p *Provider) GetBinary(ctx context.Context, constrains Dependencies) (K6Binary, error) { artifact, err := p.GetArtifact(ctx, constrains) if err != nil { return K6Binary{}, err @@ -339,7 +308,7 @@ func (p *Provider) GetBinary( // ensure the binary's directory always exists // this is slightly inefficient but simplifies logic artifactDir := filepath.Join(p.binDir, artifact.ID) - err = os.MkdirAll(artifactDir, 0o700) + err = os.MkdirAll(artifactDir, 0o700) //nolint:forbidigo if err != nil { return K6Binary{}, NewWrappedError(ErrBinary, err) } @@ -353,10 +322,15 @@ func (p *Provider) GetBinary( defer lock.unlock() //nolint:errcheck binPath := filepath.Join(artifactDir, k6Binary) - _, err = os.Stat(binPath) + _, err = os.Stat(binPath) //nolint:forbidigo // binary already exists and is valid if err == nil { + p.logger.Info("Using cached k6 binary", + "path", binPath, + "artifact_id", artifact.ID, + "deps", artifact.Dependencies, + ) go p.pruner.Touch(binPath) return K6Binary{ @@ -368,16 +342,29 @@ func (p *Provider) GetBinary( } // if there's other error) - if !os.IsNotExist(err) { + if !os.IsNotExist(err) { //nolint:forbidigo return K6Binary{}, NewWrappedError(ErrBinary, err) } + p.logger.Info("Downloading custom k6 binary", + "artifact_id", artifact.ID, + "deps", artifact.Dependencies, + ) + p.logger.Debug("Downloading custom k6 binary", + "url", artifact.URL, + ) err = p.downloader.download(ctx, artifact.URL, binPath, artifact.Checksum) if err != nil { - _ = os.RemoveAll(artifactDir) + _ = os.RemoveAll(artifactDir) //nolint:forbidigo return K6Binary{}, NewWrappedError(ErrDownload, err) } + p.logger.Info("Custom k6 binary ready", + "path", binPath, + "artifact_id", artifact.ID, + "deps", artifact.Dependencies, + ) + // start pruning in background // TODO: handle case the calling process is cancelled go p.pruner.Prune() //nolint:errcheck @@ -391,26 +378,20 @@ func (p *Provider) GetBinary( }, nil } -// buildDeps takes a set of k6 dependencies and returns a string representing -// the version constraints for the k6 and a slice of k6build.Dependencies -// representing the extension dependencies. The default k6 constrain is "*". -func buildDeps(deps Dependencies) (string, []k6build.Dependency) { - bdeps := make([]k6build.Dependency, 0, len(deps)) +func buildDeps(deps Dependencies) (string, []dependency) { + bdeps := make([]dependency, 0, len(deps)) k6constraint := "*" - for dep, constrains := range deps { + for dep, constraints := range deps { if dep == k6Module { - k6constraint = constrains + k6constraint = constraints continue } - bdeps = append( - bdeps, - k6build.Dependency{ - Name: dep, - Constraints: constrains, - }, - ) + bdeps = append(bdeps, dependency{ + Name: dep, + Constraints: constraints, + }) } return k6constraint, bdeps diff --git a/vendor/github.com/grafana/k6provider/pruner.go b/vendor/github.com/grafana/k6provider/pruner.go index 87b33b301d..898fadacca 100644 --- a/vendor/github.com/grafana/k6provider/pruner.go +++ b/vendor/github.com/grafana/k6provider/pruner.go @@ -3,6 +3,8 @@ package k6provider import ( "errors" "fmt" + "io" + "log/slog" "os" "path/filepath" "sort" @@ -10,7 +12,7 @@ import ( "time" ) -// Pruner prunes binaries suing a LRU policy to enforce a limit +// Pruner prunes binaries using a LRU policy to enforce a limit // defined in a high-water-mark. type Pruner struct { pruneLock sync.Mutex @@ -19,6 +21,7 @@ type Pruner struct { hwm int64 pruneInterval time.Duration lastPrune time.Time + logger *slog.Logger } type pruneTarget struct { @@ -30,11 +33,21 @@ type pruneTarget struct { // NewPruner creates a [Pruner] given its high-water-mark limit, and the // prune interval func NewPruner(dir string, hwm int64, pruneInterval time.Duration) *Pruner { + return NewPrunerWithLogger(dir, hwm, pruneInterval, nil) +} + +// NewPrunerWithLogger creates a [Pruner] with the given logger. +// If logger is nil, a discard logger is used. +func NewPrunerWithLogger(dir string, hwm int64, pruneInterval time.Duration, logger *slog.Logger) *Pruner { + if logger == nil { + logger = slog.New(slog.NewTextHandler(io.Discard, nil)) + } return &Pruner{ dirLock: newDirLock(dir), dir: dir, hwm: hwm, pruneInterval: pruneInterval, + logger: logger, } } @@ -43,8 +56,40 @@ func (p *Pruner) Touch(binPath string) { if p.hwm > 0 { p.pruneLock.Lock() defer p.pruneLock.Unlock() - _ = os.Chtimes(binPath, time.Now(), time.Now()) + _ = os.Chtimes(binPath, time.Now(), time.Now()) //nolint:forbidigo + } +} + +// scanTargets reads the cache directory and returns the list of binaries +// eligible for pruning together with the total cache size. +func (p *Pruner) scanTargets() ([]pruneTarget, int64, error) { + binaries, err := os.ReadDir(p.dir) //nolint:forbidigo + if err != nil { + return nil, 0, fmt.Errorf("%w: %w", ErrPruningCache, err) + } + + var ( + cacheSize int64 + pruneTargets []pruneTarget + ) + for _, binDir := range binaries { + // skip any spurious file, each binary is in a directory + if !binDir.IsDir() { + continue + } + binPath := filepath.Join(p.dir, binDir.Name(), k6Binary) + binInfo, err := os.Stat(binPath) //nolint:forbidigo + if err != nil { + continue + } + cacheSize += binInfo.Size() + pruneTargets = append(pruneTargets, pruneTarget{ + path: filepath.Dir(binPath), // we are going to prune the directory + size: binInfo.Size(), + timestamp: binInfo.ModTime(), + }) } + return pruneTargets, cacheSize, nil } // Prune the cache of least recently used files @@ -77,50 +122,37 @@ func (p *Pruner) Prune() error { _ = p.dirLock.unlock() }() - binaries, err := os.ReadDir(p.dir) + pruneTargets, cacheSize, err := p.scanTargets() if err != nil { - return fmt.Errorf("%w: %w", ErrPruningCache, err) - } - - errs := []error{ErrPruningCache} - cacheSize := int64(0) - pruneTargets := []pruneTarget{} - for _, binDir := range binaries { - // skip any spurious file, each binary is in a directory - if !binDir.IsDir() { - continue - } - - binPath := filepath.Join(p.dir, binDir.Name(), k6Binary) - binInfo, err := os.Stat(binPath) - if err != nil { - errs = append(errs, err) - continue - } - cacheSize += binInfo.Size() - pruneTargets = append( - pruneTargets, - pruneTarget{ - path: filepath.Dir(binPath), // we are going to prune the directory - size: binInfo.Size(), - timestamp: binInfo.ModTime(), - }) + return err } if cacheSize <= p.hwm { return nil } + p.logger.Info("Pruning binary cache", + "dir", p.dir, + "cache_size", cacheSize, + "limit", p.hwm, + "entries", len(pruneTargets), + ) + sort.Slice(pruneTargets, func(i, j int) bool { return pruneTargets[i].timestamp.Before(pruneTargets[j].timestamp) }) + errs := []error{ErrPruningCache} for _, target := range pruneTargets { - if err := os.RemoveAll(target.path); err != nil { + if err := os.RemoveAll(target.path); err != nil { //nolint:forbidigo errs = append(errs, err) continue } + p.logger.Debug("Pruned cached binary", + "path", target.path, + "size", target.size, + ) cacheSize -= target.size if cacheSize <= p.hwm { return nil diff --git a/vendor/modules.txt b/vendor/modules.txt index e64ff4e1a0..f3e62aab7c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -180,12 +180,7 @@ github.com/gorilla/websocket # github.com/grafana/k6-cloud-openapi-client-go v0.0.0-20260413092759-f97df3966651 ## explicit; go 1.23.4 github.com/grafana/k6-cloud-openapi-client-go/k6 -# github.com/grafana/k6build v0.5.15 -## explicit; go 1.24.0 -github.com/grafana/k6build -github.com/grafana/k6build/pkg/api -github.com/grafana/k6build/pkg/client -# github.com/grafana/k6provider v0.2.0 +# github.com/grafana/k6provider v0.3.0 ## explicit; go 1.24.0 github.com/grafana/k6provider # github.com/grafana/sobek v0.0.0-20260406180825-6d789dcdd177