From ee92b4df8d22caaba6e2013eb31aae9c728d653e Mon Sep 17 00:00:00 2001 From: Philippe Martin Date: Mon, 3 Jul 2023 15:26:48 +0200 Subject: [PATCH] Update to latest devfile-lifecycle version, license compatible --- go.mod | 3 +- go.sum | 6 +- .../github.com/Heiko-san/mermaidgen/LICENSE | 674 ------------------ .../Heiko-san/mermaidgen/flowchart/Edge.go | 61 -- .../mermaidgen/flowchart/EdgeStyle.go | 69 -- .../mermaidgen/flowchart/Flowchart.go | 242 ------- .../mermaidgen/flowchart/HtmlColor.go | 15 - .../Heiko-san/mermaidgen/flowchart/Node.go | 73 -- .../mermaidgen/flowchart/NodeStyle.go | 52 -- .../mermaidgen/flowchart/Subgraph.go | 72 -- .../Heiko-san/mermaidgen/flowchart/doc.go | 69 -- .../devfile-lifecycle/pkg/graph/graph.go | 25 +- vendor/modules.txt | 5 +- 13 files changed, 18 insertions(+), 1348 deletions(-) delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/LICENSE delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/Edge.go delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/EdgeStyle.go delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/Flowchart.go delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/HtmlColor.go delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/Node.go delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/NodeStyle.go delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/Subgraph.go delete mode 100644 vendor/github.com/Heiko-san/mermaidgen/flowchart/doc.go diff --git a/go.mod b/go.mod index bc25a097b04..f6ea24dd57b 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/devfile/registry-support/index/generator v0.0.0-20230322155332-33914affc83b github.com/devfile/registry-support/registry-library v0.0.0-20221201200738-19293ac0b8ab github.com/fatih/color v1.14.1 + github.com/feloy/devfile-lifecycle v0.0.0-20230703132439-dcf25e046335 github.com/frapposelli/wwhrd v0.4.0 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 @@ -75,7 +76,6 @@ require ( github.com/ActiveState/termtest/xpty v0.6.0 // indirect github.com/ActiveState/vt10x v1.3.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/Heiko-san/mermaidgen v0.0.0-20190623222458-ec72afae378b // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 // indirect @@ -109,7 +109,6 @@ require ( github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect - github.com/feloy/devfile-lifecycle v0.0.0-20230515183001-11d088157da2 // indirect github.com/go-errors/errors v1.0.1 // indirect github.com/go-git/gcfg v1.5.0 // indirect github.com/go-git/go-billy/v5 v5.4.1 // indirect diff --git a/go.sum b/go.sum index a92bc635787..316644500f9 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,6 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Heiko-san/mermaidgen v0.0.0-20190623222458-ec72afae378b h1:vMD9lRM0RSgyh32p9nu7guZq99XBo+m2LTTgih1Jkyc= -github.com/Heiko-san/mermaidgen v0.0.0-20190623222458-ec72afae378b/go.mod h1:wsRHegZ2aKrPucCK/XTSCe3stHT09+U8aAM5AZ0XdKY= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= @@ -461,8 +459,8 @@ github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8Wlg github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/feloy/devfile-lifecycle v0.0.0-20230515183001-11d088157da2 h1:yu3RkIH8lmDrtC0HaTEc5weAWcyCu0TOB3Gxo8jqNxw= -github.com/feloy/devfile-lifecycle v0.0.0-20230515183001-11d088157da2/go.mod h1:iATIK0fjTcnDmYCKfefNd7Fiw0TEn3V0Q4nmNNuYvvY= +github.com/feloy/devfile-lifecycle v0.0.0-20230703132439-dcf25e046335 h1:fNtlKfkIi1QZcfvjHnXvP+w7kH6846jH9flvDHJgpWA= +github.com/feloy/devfile-lifecycle v0.0.0-20230703132439-dcf25e046335/go.mod h1:rBF2ebDSKA42kFdoWAETkPplCUoQgjMWRMyYjgymERg= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/vendor/github.com/Heiko-san/mermaidgen/LICENSE b/vendor/github.com/Heiko-san/mermaidgen/LICENSE deleted file mode 100644 index f288702d2fa..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 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 General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is 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. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - 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. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - 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 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. Use with the GNU Affero General Public License. - - 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 Affero 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 special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 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 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 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 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - 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 GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Edge.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/Edge.go deleted file mode 100644 index b1e7ded0f56..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Edge.go +++ /dev/null @@ -1,61 +0,0 @@ -package flowchart - -import ( - "fmt" - "strconv" - "strings" -) - -type edgeShape string - -// Shape definitions for Edges as described at -// https://mermaidjs.github.io/flowchart.html#links-between-nodes. -// When added to a Flowchart, Edges get the EShapeArrow shape as the default. -const ( - EShapeArrow edgeShape = `-->` - EShapeDottedArrow edgeShape = `-.->` - EShapeThickArrow edgeShape = `==>` - EShapeLine edgeShape = `---` - EShapeDottedLine edgeShape = `-.-` - EShapeThickLine edgeShape = `===` -) - -// Edge represents a connection between 2 Nodes. -// Create an instance of Edge via Flowchart's AddEdge method, do not create -// instances directly. Already defined IDs (indices) can be looked up via -// Flowchart's GetEdge method or iterated over via its ListEdges method. -type Edge struct { - id int - From *Node // Pointer to the Node where the Edge starts. - To *Node // Pointer to the Node where the Edge ends. - Shape edgeShape // The shape of this Edge. - Text []string // Optional text lines to be added along the Edge. - Style *EdgeStyle // Optional CSS style. -} - -// ID provides access to the Edge's readonly field id. -// Since Edges don't really have IDs, this actually is the index when the Edge -// was added, which is used for linkStyle lines. -func (e *Edge) ID() (id int) { - return e.id -} - -// String renders this graph element to an edge definition line. -// If Style member is set an additional linkStyle line will be created. -func (e *Edge) String() (renderedElement string) { - line := string(e.Shape) - if len(e.Text) > 0 { - line += fmt.Sprintf(`|"%s"|`, strings.Join(e.Text, "
")) - } - text := fmt.Sprintf("%s %s %s\n", e.From.id, line, e.To.id) - if e.Style != nil { - text += fmt.Sprintf(e.Style.String(), strconv.Itoa(e.id)) - } - return text -} - -// AddLines adds one or more lines of text to the Text member. -// This text gets rendered along the Edge, separated by
's. -func (e *Edge) AddLines(lines ...string) { - e.Text = append(e.Text, lines...) -} diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/EdgeStyle.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/EdgeStyle.go deleted file mode 100644 index 998f25f6f3d..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/EdgeStyle.go +++ /dev/null @@ -1,69 +0,0 @@ -package flowchart - -import ( - "fmt" - "strings" -) - -type edgeInterpolation string - -// Interpolation definitions for Edges as described at -// https://github.com/knsv/mermaid/issues/580#issuecomment-373929046. -// The default behaviour if no interpolation is given at all is -// InterpolationLinear. -const ( - InterpolationBasis edgeInterpolation = `basis` - InterpolationLinear edgeInterpolation = `linear` -) - -// An EdgeStyle is used to add CSS to an Edge. It renders to a linkStyle line -// for each Edge it is associated with. Note that linkStyles will override any -// effect from the Edge's shape defintion. -// Retrieve an instance of EdgeStyle via Flowchart's EdgeStyle method, do not -// create instances directly. -type EdgeStyle struct { - id string // virtual ID for lookup - Stroke htmlColor // Renders to stroke:#333 - StrokeWidth uint8 // Renders to stroke-width:2px - StrokeDash uint8 // Renders to stroke-dasharray:5px - More string // More styles, e.g.: stroke:#333,stroke-width:1px - Interpolation edgeInterpolation // Edge curve definition -} - -// ID provides access to the EdgeStyle's readonly field id. -func (es *EdgeStyle) ID() (id string) { - return es.id -} - -// String renders this graph element to a linkStyle line. -func (es *EdgeStyle) String() (renderedElement string) { - interpolation := "" - if es.Interpolation != "" { - interpolation = "interpolate " + string(es.Interpolation) - } - styles := []string{} - if es.Stroke != "" { - styles = append(styles, "stroke:"+string(es.Stroke)) - } - if es.StrokeWidth != 1 { - styles = append(styles, fmt.Sprintf(`stroke-width:%dpx`, - es.StrokeWidth)) - } - if es.StrokeDash != 0 { - styles = append(styles, fmt.Sprintf(`stroke-dasharray:%dpx`, - es.StrokeDash)) - } - if es.More != "" { - styles = append(styles, es.More) - } - definitions := strings.Join(styles, ",") - if definitions == "" && interpolation == "" { - // neutral element as a fallback to ensure empty linkStyles don't break - // the mermaid syntax - definitions = fmt.Sprintf(`stroke-width:%dpx`, es.StrokeWidth) - } - if definitions != "" && interpolation != "" { - interpolation += " " - } - return `linkStyle %s ` + interpolation + definitions + "\n" -} diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Flowchart.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/Flowchart.go deleted file mode 100644 index 363df87ce04..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Flowchart.go +++ /dev/null @@ -1,242 +0,0 @@ -package flowchart - -import ( - "encoding/base64" - "encoding/json" - "fmt" - "os/exec" - "runtime" -) - -////////// ChartDirection ////////////////////////////////////////////////////// - -type chartDirection string - -// Direction definitions for Flowcharts as described at -// https://mermaidjs.github.io/flowchart.html#graph. -// New Flowcharts get DirectionTopDown as the default. -const ( - DirectionTopDown chartDirection = `TB` - DirectionBottomUp chartDirection = `BT` - DirectionRightLeft chartDirection = `RL` - DirectionLeftRight chartDirection = `LR` -) - -////////// GraphItem /////////////////////////////////////////////////////////// - -// interface to define what can be an "item" to a Flowchart/Subgraph -type graphItem interface { - renderGraph() string -} - -////////// Flowchart /////////////////////////////////////////////////////////// - -// Flowchart objects are the entrypoints to this package, the whole graph is -// constructed around a Flowchart object. Create an instance of Flowchart via -// Flowchart's constructor NewFlowchart, do not create instances directly. -type Flowchart struct { - nodeStyles map[string]*NodeStyle // internal storage for NodeStyles - edgeStyles map[string]*EdgeStyle // internal storage for EdgeStyles - subgraphs map[string]*Subgraph // internal storage for Subgraphs - nodes map[string]*Node // internal storage for Nodes - edges []*Edge // internal storage for Edges - items []graphItem // sub-items to render - Direction chartDirection // The direction used to render the graph. - DefaultEdgeStyle *EdgeStyle // Define a default linkStyle element. -} - -// NewFlowchart is the constructor used to create a new Flowchart object. -// This object is the entrypoint for any further interactions with your graph. -// Always use the constructor, don't create Flowchart objects directly. -func NewFlowchart() (newFlowchart *Flowchart) { - f := &Flowchart{} - f.Direction = DirectionTopDown - f.nodeStyles = make(map[string]*NodeStyle) - f.edgeStyles = make(map[string]*EdgeStyle) - f.subgraphs = make(map[string]*Subgraph) - f.nodes = make(map[string]*Node) - return f -} - -// String recursively renders the whole graph to mermaid code lines. -func (fc *Flowchart) String() (renderedElement string) { - text := fmt.Sprintf("graph %s\n", fc.Direction) - if fc.DefaultEdgeStyle != nil { - text += fmt.Sprintf(fc.DefaultEdgeStyle.String(), "default") - } - for _, s := range fc.nodeStyles { - text += s.String() - } - for _, item := range fc.items { - text += item.renderGraph() - } - for _, e := range fc.edges { - text += e.String() - } - return text -} - -// Structs for JSON encode -type mermaidJSON struct { - Theme string `json:"theme"` -} -type dataJSON struct { - Code string `json:"code"` - Mermaid mermaidJSON `json:"mermaid"` -} - -// LiveURL renders the Flowchart and generates a view URL for -// https://mermaidjs.github.io/mermaid-live-editor from it. -func (fc *Flowchart) LiveURL() (url string) { - liveURL := `https://mermaidjs.github.io/mermaid-live-editor/#/view/` - data, _ := json.Marshal(dataJSON{ - Code: fc.String(), Mermaid: mermaidJSON{Theme: "default"}}) - return liveURL + base64.URLEncoding.EncodeToString(data) -} - -// ViewInBrowser uses the URL generated by Flowchart's LiveURL method and opens -// that URL in the OS's default browser. It starts the browser command -// non-blocking and eventually returns any error occured. -func (fc *Flowchart) ViewInBrowser() (err error) { - switch runtime.GOOS { - case "openbsd", "linux": - return exec.Command("xdg-open", fc.LiveURL()).Start() - case "darwin": - return exec.Command("open", fc.LiveURL()).Start() - case "windows": - return exec.Command("rundll32", "url.dll,FileProtocolHandler", - fc.LiveURL()).Start() - default: - return fmt.Errorf("unsupported platform") - } -} - -////////// add & get Styles //////////////////////////////////////////////////// - -// NodeStyle is used to create new or lookup existing NodeStyles by ID. -// The returned object pointers can be assigned to any number of Nodes -// to style them using CSS. -func (fc *Flowchart) NodeStyle(id string) (style *NodeStyle) { - s, found := fc.nodeStyles[id] - if !found { - s = &NodeStyle{id: id, StrokeWidth: 1} - fc.nodeStyles[id] = s - } - return s -} - -// EdgeStyle is used to create new or lookup existing EdgeStyles by ID. -// The returned object pointers can be assigned to any number of Edges -// to style them using CSS. Note that EdgeStyles override the shape of an Edge, -// e.g. if you color an Edge that uses EShapeDottedArrow it looses its dotted -// nature unless you define a dotted line using the EdgeStyle. -func (fc *Flowchart) EdgeStyle(id string) (style *EdgeStyle) { - s, found := fc.edgeStyles[id] - if !found { - s = &EdgeStyle{id: id, StrokeWidth: 1} - fc.edgeStyles[id] = s - } - return s -} - -////////// add Items /////////////////////////////////////////////////////////// - -// AddSubgraph is used to add a nested Subgraph to the Flowchart. -// If the provided ID already exists, no new Subgraph is created and nil is -// returned. The ID can later be used to lookup the created Subgraph using -// Flowchart's GetSubgraph method. If you want to add a Subgraph to a Subgraph, -// use that Subgraph's AddSubgraph method. -func (fc *Flowchart) AddSubgraph(id string) (newSubgraph *Subgraph) { - _, alreadyExists := fc.subgraphs[id] - if alreadyExists { - return nil - } - s := &Subgraph{id: id, flowchart: fc} - fc.subgraphs[id] = s - fc.items = append(fc.items, s) - return s -} - -// AddNode is used to add a new Node to the Flowchart. If the provided ID -// already exists, no new Node is created and nil is returned. The ID can later -// be used to lookup the created Node using Flowchart's GetNode method. -// If you want to add a Node to a Subgraph, use that Subgraph's AddNode method. -func (fc *Flowchart) AddNode(id string) (newNode *Node) { - _, alreadyExists := fc.nodes[id] - if alreadyExists { - return nil - } - n := &Node{id: id, Shape: NShapeRect} - fc.nodes[id] = n - fc.items = append(fc.items, n) - return n -} - -// AddEdge is used to add a new Edge to the Flowchart. Since Edges have no IDs -// this will always succeed. The (pseudo) ID is the index that defines the order -// of all Edges and is used to define linkStyles. The ID can later be used to -// lookup the created Edge using Flowchart's GetEdge method. -func (fc *Flowchart) AddEdge(from *Node, to *Node) (newEdge *Edge) { - e := &Edge{From: from, To: to, Shape: EShapeArrow} - fc.edges = append(fc.edges, e) - e.id = len(fc.edges) - 1 - return e -} - -////////// get Items /////////////////////////////////////////////////////////// - -// GetSubgraph looks up a previously defined Subgraph by its ID. -// If this ID doesn't exist, nil is returned. -// Use Flowchart's or Subgraph's AddSubgraph to create new Subgraphs. -func (fc *Flowchart) GetSubgraph(id string) (existingSubgraph *Subgraph) { - // if not found -> nil - return fc.subgraphs[id] -} - -// GetNode looks up a previously defined Node by its ID. -// If this ID doesn't exist, nil is returned. -// Use Flowchart's or Subgraph's AddNode to create new Nodes. -func (fc *Flowchart) GetNode(id string) (existingNode *Node) { - // if not found -> nil - return fc.nodes[id] -} - -// GetEdge looks up a previously defined Edge by its ID (index). -// If this index doesn't exist, nil is returned. -// Use Flowchart's AddEdge to create new Edges. -func (fc *Flowchart) GetEdge(index int) (existingEdge *Edge) { - if index < 0 || len(fc.edges) <= index { - return nil - } - return fc.edges[index] -} - -////////// list Items ////////////////////////////////////////////////////////// - -// ListSubgraphs returns a slice of all previously defined Subgraphs. -// The order is not well-defined. -func (fc *Flowchart) ListSubgraphs() (allSubgraphs []*Subgraph) { - values := make([]*Subgraph, 0, len(fc.subgraphs)) - for _, v := range fc.subgraphs { - values = append(values, v) - } - return values -} - -// ListNodes returns a slice of all previously defined Nodes. -// The order is not well-defined. -func (fc *Flowchart) ListNodes() (allNodes []*Node) { - values := make([]*Node, 0, len(fc.nodes)) - for _, v := range fc.nodes { - values = append(values, v) - } - return values -} - -// ListEdges returns a slice of all previously defined Edges in the order they -// were added. -func (fc *Flowchart) ListEdges() (allEdges []*Edge) { - e := make([]*Edge, len(fc.edges)) - copy(e, fc.edges) - return e -} diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/HtmlColor.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/HtmlColor.go deleted file mode 100644 index 3f613d2cf5c..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/HtmlColor.go +++ /dev/null @@ -1,15 +0,0 @@ -package flowchart - -type htmlColor string - -// Color definitions for use with NodeStyles and EdgeStyles. -const ( - ColorBlack htmlColor = `#000` - ColorBlue htmlColor = `#00f` - ColorGreen htmlColor = `#0f0` - ColorCyan htmlColor = `#0ff` - ColorRed htmlColor = `#f00` - ColorMagenta htmlColor = `#f0f` - ColorYellow htmlColor = `#ff0` - ColorWhite htmlColor = `#fff` -) diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Node.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/Node.go deleted file mode 100644 index 9f816694218..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Node.go +++ /dev/null @@ -1,73 +0,0 @@ -package flowchart - -import ( - "fmt" - "strings" -) - -type nodeShape string - -// Shape definitions for Nodes as described at -// https://mermaidjs.github.io/flowchart.html#nodes--shapes. -// When added to a Flowchart or Subgraph, Nodes get the NShapeRect shape as the -// default. -const ( - NShapeRect nodeShape = `["%s"]` - NShapeRoundRect nodeShape = `("%s")` - NShapeCircle nodeShape = `(("%s"))` - NShapeRhombus nodeShape = `{"%s"}` - NShapeFlagLeft nodeShape = `>"%s"]` -) - -// Node represents a single, unique node of the Flowchart graph. -// Create an instance of Node via Flowchart's or Subgraph's AddNode method, do -// not create instances directly. Already defined IDs can be looked up via -// Flowchart's GetNode method or iterated over via its ListNodes method. -type Node struct { - id string - Shape nodeShape // The shape of this Node. - Text []string // The body text, ID if no text is added. - Link string // Optional URL for a click-hook. - LinkText string // Optional tooltip for the link. - Style *NodeStyle // Optional CSS style. -} - -// ID provides access to the Node's readonly field id. -func (n *Node) ID() (id string) { - return n.id -} - -// Implements graphItem, see String() for further details. -func (n *Node) renderGraph() string { - textbox := n.id - if len(n.Text) > 0 { - textbox = strings.Join(n.Text, "
") - } - text := n.id + fmt.Sprintf(string(n.Shape), textbox) + "\n" - if n.Style != nil { - text += fmt.Sprintf("class %s %s\n", n.id, n.Style.id) - } - if n.Link != "" { - linktxt := n.Link - if n.LinkText != "" { - linktxt = n.LinkText - } - text += fmt.Sprintf("click %s \"%s\" \"%s\"\n", - n.id, n.Link, linktxt) - } - return text -} - -// String renders this graph element to a node definition line. -// If Style member is set an additional class line will be created. -// If Link member is set an additional click line will be created. -func (n *Node) String() (renderedElement string) { - return n.renderGraph() -} - -// AddLines adds one or more lines of text to the Text member. -// This text gets rendered to the Node's body, separated by
's. -// If no text is added, the Node's ID is rendered to its body. -func (n *Node) AddLines(lines ...string) { - n.Text = append(n.Text, lines...) -} diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/NodeStyle.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/NodeStyle.go deleted file mode 100644 index 9775309a08d..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/NodeStyle.go +++ /dev/null @@ -1,52 +0,0 @@ -package flowchart - -import ( - "fmt" - "strings" -) - -// A NodeStyle is used to add CSS to a Node. It renders to a classDef line. -// Retrieve an instance of NodeStyle via Flowchart's NodeStyle method, do not -// create instances directly. -type NodeStyle struct { - id string - Fill htmlColor // renders to something like fill:#f9f - Stroke htmlColor // renders to something like stroke:#333 - StrokeWidth uint8 // renders to something like stroke-width:2px - StrokeDash uint8 // renders to something like stroke-dasharray:5px - More string // more styles, e.g.: stroke:#333,stroke-width:1px -} - -// ID provides access to the NodeStyle's readonly field id. -func (ns *NodeStyle) ID() (id string) { - return ns.id -} - -// String renders this graph element to a classDef line. -func (ns *NodeStyle) String() (renderedElement string) { - styles := []string{} - if ns.Fill != "" { - styles = append(styles, "fill:"+string(ns.Fill)) - } - if ns.Stroke != "" { - styles = append(styles, "stroke:"+string(ns.Stroke)) - } - if ns.StrokeWidth != 1 { - styles = append(styles, fmt.Sprintf(`stroke-width:%dpx`, - ns.StrokeWidth)) - } - if ns.StrokeDash != 0 { - styles = append(styles, fmt.Sprintf(`stroke-dasharray:%dpx`, - ns.StrokeDash)) - } - if ns.More != "" { - styles = append(styles, ns.More) - } - definitions := strings.Join(styles, ",") - if definitions == "" { - // neutral element as a fallback to ensure empty classDefs don't break - // the mermaid syntax - definitions = fmt.Sprintf(`stroke-width:%dpx`, ns.StrokeWidth) - } - return fmt.Sprintf("classDef %s %s\n", ns.id, definitions) -} diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Subgraph.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/Subgraph.go deleted file mode 100644 index 980ca4cdb4a..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/Subgraph.go +++ /dev/null @@ -1,72 +0,0 @@ -package flowchart - -import ( - "fmt" -) - -// Subgraph represents a subgraph block on the Flowchart graph where nested -// Subgraphs and Nodes can be added. Create an instance of Subgraph via -// Flowchart's or Subgraph's AddSubgraph method, do not create instances -// directly. Already defined IDs can be looked up via Flowchart's GetSubgraph -// method or iterated over via its ListSubgraphs method. -type Subgraph struct { - id string // virtual ID for lookup - flowchart *Flowchart // top lvl pointer - items []graphItem // sub-items to render - Title string // The title of this Subgraph. -} - -// ID provides access to the Subgraph's readonly field id. -func (sg *Subgraph) ID() (id string) { - return sg.id -} - -// Flowchart provides access to the Subgraph's underlying Flowchart to be able -// to access Adder, Getter and Lister methods or to lookup Styles. -func (sg *Subgraph) Flowchart() (topLevel *Flowchart) { - return sg.flowchart -} - -// Implements graphItem, see String() for further details. -func (sg *Subgraph) renderGraph() string { - text := fmt.Sprintln("subgraph", sg.Title) - for _, item := range sg.items { - text += item.renderGraph() - } - text += "end\n" - return text -} - -// String renders this graph element to a subgraph block. -func (sg *Subgraph) String() (renderedElement string) { - return sg.renderGraph() -} - -// AddSubgraph is used to add another nested Subgraph below this Subgraph layer. -// If the provided ID already exists, no new Subgraph is created and nil is -// returned. The ID can later be used to lookup the created Subgraph using -// Flowchart's GetSubgraph method. -func (sg *Subgraph) AddSubgraph(id string) (newSubgraph *Subgraph) { - _, alreadyExists := sg.flowchart.subgraphs[id] - if alreadyExists { - return nil - } - s := &Subgraph{id: id, flowchart: sg.flowchart} - sg.flowchart.subgraphs[id] = s - sg.items = append(sg.items, s) - return s -} - -// AddNode is used to add a new Node to this Subgraph layer. If the provided ID -// already exists, no new Node is created and nil is returned. The ID can later -// be used to lookup the created Node using Flowchart's GetNode method. -func (sg *Subgraph) AddNode(id string) (newNode *Node) { - _, alreadyExists := sg.flowchart.nodes[id] - if alreadyExists { - return nil - } - n := &Node{id: id, Shape: NShapeRect} - sg.flowchart.nodes[id] = n - sg.items = append(sg.items, n) - return n -} diff --git a/vendor/github.com/Heiko-san/mermaidgen/flowchart/doc.go b/vendor/github.com/Heiko-san/mermaidgen/flowchart/doc.go deleted file mode 100644 index 6fbf0ee5047..00000000000 --- a/vendor/github.com/Heiko-san/mermaidgen/flowchart/doc.go +++ /dev/null @@ -1,69 +0,0 @@ -/* -Package flowchart is an object oriented approach to define mermaid flowcharts as -defined at https://mermaidjs.github.io/flowchart.html and render them to mermaid -code. - -You use the constructor NewFlowchart to create a new Flowchart object. - - chart := flowchart.NewFlowchart() - -This object is used to construct a graph using various class methods, such as: - - node1 := chart.AddNode("myNodeId1") - node2 := chart.AddNode("myNodeId2") - edge1 := chart.AddEdge(node1, node2) - -Once the graph is completely defined, it can be "rendered" to mermaid code by -stringifying the Flowchart object. - - fmt.Print(chart) - -Which then creates: - - graph TB - myNodeId1["myNodeId1"] - myNodeId2["myNodeId2"] - myNodeId1 --> myNodeId2 - -The package supports defining CSS styles, that can be assigned to Nodes and -Edges. - - ns1 := chart.NodeStyle("myStyleId1") - ns1.StrokeWidth = 3 - ns1.StrokeDash = 5 - es1 := chart.EdgeStyle("myStyleId1") - es1.Stroke = "#f00" - es1.StrokeWidth = 2 - node1.Style = ns1 - node2.Style = chart.NodeStyle("myStyleId1") - edge1.Style = es1 - -There are various useful constants and further styling options, too. - - es1.Stroke = flowchart.ColorRed - node1.Shape = flowchart.NShapeRoundRect - node2.Shape = flowchart.NShapeCircle - edge1.Shape = flowchart.EShapeThickLine - -Let's add some text and maybe a link. - - node1.AddLines("my body text") - node1.Link = "http://www.example.com" - node1.LinkText = "go to example" - -What we have by now is: - - graph TB - classDef myStyleId1 stroke-width:3px,stroke-dasharray:5px - myNodeId1("my body text") - class myNodeId1 myStyleId1 - click myNodeId1 "http://www.example.com" "go to example" - myNodeId2(("myNodeId2")) - class myNodeId2 myStyleId1 - myNodeId1 === myNodeId2 - linkStyle 0 stroke-width:2px,stroke:#f00 - -And there is more. Just explore the package. Start at Flowchart and proceed to -Subgraph. -*/ -package flowchart diff --git a/vendor/github.com/feloy/devfile-lifecycle/pkg/graph/graph.go b/vendor/github.com/feloy/devfile-lifecycle/pkg/graph/graph.go index 08ef758f0e6..79494181a8e 100644 --- a/vendor/github.com/feloy/devfile-lifecycle/pkg/graph/graph.go +++ b/vendor/github.com/feloy/devfile-lifecycle/pkg/graph/graph.go @@ -1,9 +1,9 @@ package graph import ( + "fmt" "sort" - - "github.com/Heiko-san/mermaidgen/flowchart" + "strings" ) type Graph struct { @@ -37,10 +37,11 @@ func (o *Graph) AddEdge(from *Node, to *Node, text ...string) *Edge { return &edge } -func (o *Graph) ToFlowchart() *flowchart.Flowchart { - f := flowchart.NewFlowchart() - n := f.AddNode(o.EntryNodeID) - n.Text = o.nodes[o.EntryNodeID].Text +func (o *Graph) ToFlowchart() string { + var str strings.Builder + str.WriteString("graph TB\n") + str.WriteString(fmt.Sprintf("%s[\"%s\"]\n", o.EntryNodeID, strings.Join(o.nodes[o.EntryNodeID].Text, "
"))) + keys := make([]string, 0, len(o.nodes)) for k := range o.nodes { keys = append(keys, k) @@ -52,15 +53,17 @@ func (o *Graph) ToFlowchart() *flowchart.Flowchart { if node.ID == o.EntryNodeID { continue } - n := f.AddNode(node.ID) - n.Text = node.Text + if len(node.Text) == 0 { + node.Text = []string{node.ID} + } + str.WriteString(fmt.Sprintf("%s[\"%s\"]\n", node.ID, strings.Join(node.Text, "
"))) } for _, edge := range o.edges { - e := f.AddEdge(f.GetNode(edge.From.ID), f.GetNode(edge.To.ID)) - e.Text = edge.Text + str.WriteString(fmt.Sprintf("%s -->|\"%s\"| %s\n", edge.From.ID, strings.Join(edge.Text, "
"), edge.To.ID)) } - return f + + return str.String() } type Node struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 540d8096421..4537bfc0309 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -25,9 +25,6 @@ github.com/AlecAivazis/survey/v2/terminal ## explicit; go 1.16 github.com/Azure/go-ansiterm github.com/Azure/go-ansiterm/winterm -# github.com/Heiko-san/mermaidgen v0.0.0-20190623222458-ec72afae378b -## explicit -github.com/Heiko-san/mermaidgen/flowchart # github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd ## explicit github.com/MakeNowJust/heredoc @@ -261,7 +258,7 @@ github.com/exponent-io/jsonpath # github.com/fatih/color v1.14.1 ## explicit; go 1.17 github.com/fatih/color -# github.com/feloy/devfile-lifecycle v0.0.0-20230515183001-11d088157da2 +# github.com/feloy/devfile-lifecycle v0.0.0-20230703132439-dcf25e046335 ## explicit; go 1.19 github.com/feloy/devfile-lifecycle/pkg/dftools github.com/feloy/devfile-lifecycle/pkg/graph