Added build-cloud to Makefile

.github/workflows/go.yml

@@ -22,7 +22,7 @@ jobs:
       run: make build
     - name: Test
       run: make test-with-coverage
-    # - uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v1
-    #   with:
+      with:
-    #     token: ${{ secrets.CODECOV_TOKEN }}
+        token: ${{ secrets.CODECOV_TOKEN }}
-    #     files: coverage.out
+        files: coverage.out

LICENSE

@@ -1,93 +1,674 @@
-Elastic License 2.0
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-URL: https://www.elastic.co/licensing/elastic-license
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-## Acceptance
+                            Preamble
 
-By using the software, you agree to all of the terms and conditions below.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-## Copyright License
+  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.
 
-The licensor grants you a non-exclusive, royalty-free, worldwide,
+  When we speak of free software, we are referring to freedom, not
-non-sublicensable, non-transferable license to use, copy, distribute, make
+price.  Our General Public Licenses are designed to make sure that you
-available, and prepare derivative works of the software, in each case subject to
+have the freedom to distribute copies of free software (and charge for
-the limitations and conditions below.
+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.
 
-## Limitations
+  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.
 
-You may not provide the software to third parties as a hosted or managed
+  For example, if you distribute copies of such a program, whether
-service, where the service provides users with access to any substantial set of
+gratis or for a fee, you must pass on to the recipients the same
-the features or functionality of the software.
+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.
 
-You may not move, change, disable, or circumvent the license key functionality
+  Developers that use the GNU GPL protect your rights with two steps:
-in the software, and you may not remove or obscure any functionality in the
+(1) assert copyright on the software, and (2) offer you this License
-software that is protected by the license key.
+giving you legal permission to copy, distribute and/or modify it.
 
-You may not alter, remove, or obscure any licensing, copyright, or other notices
+  For the developers' and authors' protection, the GPL clearly explains
-of the licensor in the software. Any use of the licensor’s trademarks is subject
+that there is no warranty for this free software.  For both users' and
-to applicable law.
+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.
 
-## Patents
+  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.
 
-The licensor grants you a license, under any patent claims the licensor can
+  Finally, every program is threatened constantly by software patents.
-license, or becomes able to license, to make, have made, use, sell, offer for
+States should not allow patents to restrict development and use of
-sale, import and have imported the software, in each case subject to the
+software on general-purpose computers, but in those that do, we wish to
-limitations and conditions in this license. This license does not cover any
+avoid the special danger that patents applied to a free program could
-patent claims that you cause to be infringed by modifications or additions to
+make it effectively proprietary.  To prevent this, the GPL assures that
-the software. If you or your company make any written claim that the software
+patents cannot be used to render the program non-free.
-infringes or contributes to infringement of any patent, your patent license for
-the software granted under these terms ends immediately. If your company makes
-such a claim, your patent license ends immediately for work on behalf of your
-company.
 
-## Notices
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-You must ensure that anyone who gets a copy of any part of the software from you
+                       TERMS AND CONDITIONS
-also gets a copy of these terms.
 
-If you modify the software, you must include in any modified copies of the
+  0. Definitions.
-software prominent notices stating that you have modified the software.
 
-## No Other Rights
+  "This License" refers to version 3 of the GNU General Public License.
 
-These terms do not imply any licenses other than those expressly granted in
+  "Copyright" also means copyright-like laws that apply to other kinds of
-these terms.
+works, such as semiconductor masks.
 
-## Termination
+  "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.
 
-If you use the software in violation of these terms, such use is not licensed,
+  To "modify" a work means to copy from or adapt all or part of the work
-and your licenses will automatically terminate. If the licensor provides you
+in a fashion requiring copyright permission, other than the making of an
-with a notice of your violation, and you cease all violation of this license no
+exact copy.  The resulting work is called a "modified version" of the
-later than 30 days after you receive that notice, your licenses will be
+earlier work or a work "based on" the earlier work.
-reinstated retroactively. However, if you violate these terms after such
-reinstatement, any additional violation of these terms will cause your licenses
-to terminate automatically and permanently.
 
-## No Liability
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-*As far as the law allows, the software comes as is, without any warranty or
+  To "propagate" a work means to do anything with it that, without
-condition, and the licensor will not be liable to you for any damages arising
+permission, would make you directly or secondarily liable for
-out of these terms or the use or nature of the software, under any kind of
+infringement under applicable copyright law, except executing it on a
-legal claim.*
+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.
 
-## Definitions
+  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.
 
-The **licensor** is the entity offering these terms, and the **software** is the
+  An interactive user interface displays "Appropriate Legal Notices"
-software the licensor makes available under these terms, including any portion
+to the extent that it includes a convenient and prominently visible
-of it.
+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.
 
-**you** refers to the individual or entity agreeing to these terms.
+  1. Source Code.
 
-**your company** is any legal entity, sole proprietorship, or other kind of
+  The "source code" for a work means the preferred form of the work
-organization that you work for, plus all organizations that have control over,
+for making modifications to it.  "Object code" means any non-source
-are under the control of, or are under common control with that
+form of a work.
-organization. **control** means ownership of substantially all the assets of an
-entity, or the power to direct its management and policies by vote, contract, or
-otherwise. Control can be direct or indirect.
 
-**your licenses** are all the licenses granted to you for the software under
+  A "Standard Interface" means an interface that either is an official
-these terms.
+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.
 
-**use** means anything you do with the software requiring one of your licenses.
+  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.
 
-**trademark** means trademarks, service marks, and similar rights.
+  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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<https://www.gnu.org/licenses/>.
+
+  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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Makefile

@@ -13,7 +13,7 @@ build-prod:
 	GOOS=linux GOARCH=arm RELEASE=prod make build
 
 build-cloud:
-	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 RELEASE=cloud make build
+	GDOS=linux GOARCH=amd64 RELEASE=cloud make build
 
 build:
 	@echo "Building ${GOOS}-${GOARCH}"

cmd/edgeboxctl/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"log"
 	"os"
@@ -11,304 +12,32 @@ import (
 	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/tasks"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
-	"github.com/mitchellh/colorstring"
-	"github.com/urfave/cli/v2" // imports as package "cli",
 )
 
 const defaultNotReadySleepTime time.Duration = time.Second * 60
 const defaultSleepTime time.Duration = time.Second
 
-var errorMissingApplicationSlug = colorstring.Color("[red]Error: [white]Missing application slug")
-var errorSystemNotReady = colorstring.Color("[red]Eror: [white]The system is not ready to run. \n[white]Please run 'cd /home/system/components/ws/ && ./ws -b' first.")
-var errorNotYetImplemented = colorstring.Color("[yellow]This feature is not yet implemented, this command is only a stub.")
-
 func main() {
 
-	app := &cli.App{
+	// load command line arguments
-		Name:  "edgeboxctl",
-		Usage: "A tool to facilitate hosting apps and securing your personal data",
-		Action: func(c *cli.Context) error {
-			startService() // Defaults to start as a service if no commands or flags are passed
-			return nil
-		},
-		Commands: []*cli.Command{
-			{
-				Name:    "bootstrap",
-				Aliases: []string{"b"},
-				Usage:   "Sets up initial structure and dependencies for the edgebox system",
-				Action: func(c *cli.Context) error {
-					return cli.Exit(errorNotYetImplemented, 1)
-				},
-			},
-			{
-				Name:    "tunnel",
-				Aliases: []string{"t"},
-				Usage:   "Edgebox tunnel settings",
-				Subcommands: []*cli.Command{
-					{
-						Name:    "setup",
-						Aliases: []string{"s"},
-						Usage:   "Sets up an encrypted secure connection to a tunnel",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
 
-							argumentError := checkArgumentsPresence(c, 4)
+	version := flag.Bool("version", false, "Get the version info")
-							if argumentError != nil {
+	db := flag.Bool("database", false, "Get database connection info")
-								return argumentError
+	name := flag.String("name", "edgebox", "Name for the service")
-							}
 
-							task := getCommandTask(
+	flag.Parse()
-								"setup_tunnel",
-								fmt.Sprintf(
-									"{\"bootnode_address\": \"%s\", \"token\": \"%s\", \"assigned_address\": \"%s\", \"node_name\": \"%s\"}",
-									c.Args().Get(0),
-									c.Args().Get(1),
-									c.Args().Get(2),
-									c.Args().Get(3),
-								),
-								true,
-							)
 
-							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
+	if *version {
-						},
+		printVersion()
-					},
+		os.Exit(0)
-					{
-						Name:    "enable",
-						Aliases: []string{"e"},
-						Usage:   "enables the public tunnel (when configured)",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-							return cli.Exit(errorNotYetImplemented, 1)
-						},
-					},
-					{
-						Name:    "disable",
-						Aliases: []string{"d"},
-						Usage:   "disables the public tunnel (when online)",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-							return cli.Exit(errorNotYetImplemented, 1)
-						},
-					},
-				},
-			},
-			{
-				Name:    "app",
-				Aliases: []string{"a"},
-				Usage:   "options for edgeapp management",
-				Subcommands: []*cli.Command{
-					{
-						Name:    "list",
-						Aliases: []string{"l"},
-						Usage:   "list currently installed apps and their status",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-							task := getCommandTask("list_edgeapps", "", true)
-							// return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-							return cli.Exit(task.Result.String, 0)
-						},
-					},
-					{
-						Name:    "install",
-						Aliases: []string{"i"},
-						Usage:   "install the specified app (slug or package file)",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-
-							argumentError := checkArgumentsPresence(c, 1)
-							if argumentError != nil {
-								return argumentError
-							}
-
-							task := getCommandTask("install_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
-
-							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-						},
-					},
-					{
-						Name:    "remove",
-						Aliases: []string{"r"},
-						Usage:   "remove the specified app",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-
-							argumentError := checkArgumentsPresence(c, 1)
-							if argumentError != nil {
-								return argumentError
-							}
-
-							task := getCommandTask("remove_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
-
-							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-						},
-					},
-					{
-						Name:    "start",
-						Aliases: []string{"s"},
-						Usage:   "start the specified app",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-
-							argumentError := checkArgumentsPresence(c, 1)
-							if argumentError != nil {
-								return argumentError
-							}
-
-							task := getCommandTask("start_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
-
-							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-						},
-					},
-					{
-						Name:    "stop",
-						Aliases: []string{"k"},
-						Usage:   "stop the specified app",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-
-							argumentError := checkArgumentsPresence(c, 1)
-							if argumentError != nil {
-								return argumentError
-							}
-
-							task := getCommandTask("stop_edgeapp", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
-
-							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-						},
-					},
-					{
-						Name:    "online",
-						Aliases: []string{"o"},
-						Usage:   "set an app status for online access",
-						Subcommands: []*cli.Command{
-							{
-								Name:    "enable",
-								Aliases: []string{"e"},
-								Usage:   "set an app as accessible online",
-								Before:  canRunCommands,
-								Action: func(c *cli.Context) error {
-
-									argumentError := checkArgumentsPresence(c, 2)
-									if argumentError != nil {
-										return argumentError
-									}
-
-									task := getCommandTask(
-										"enable_online",
-										fmt.Sprintf(
-											"{\"id\": \"%s\", \"internet_url\": \"%s\"}",
-											c.Args().Get(0),
-											c.Args().Get(1),
-										),
-										true,
-									)
-
-									return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-								},
-							},
-							{
-								Name:    "disable",
-								Aliases: []string{"d"},
-								Usage:   "set an app as local-network private",
-								Before:  canRunCommands,
-								Action: func(c *cli.Context) error {
-
-									argumentError := checkArgumentsPresence(c, 1)
-									if argumentError != nil {
-										return argumentError
-									}
-
-									task := getCommandTask("disable_online", fmt.Sprintf("{\"id\": \"%s\"}", c.Args().First()), true)
-
-									return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-								},
-							},
-						},
-					},
-				},
-			},
-			{
-				Name:    "dashboard",
-				Aliases: []string{"d"},
-				Usage:   "set dashboard access",
-				Subcommands: []*cli.Command{
-					{
-						Name:    "enable",
-						Aliases: []string{"e"},
-						Usage:   "enable dashboard access",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-							argumentError := checkArgumentsPresence(c, 1)
-							if argumentError != nil {
-								return argumentError
-							}
-
-							task := getCommandTask("enable_public_dashboard", fmt.Sprintf("{\"internet_url\": \"%s\"}", c.Args().First()), true)
-							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-						},
-					},
-					{
-						Name:    "disable",
-						Aliases: []string{"d"},
-						Usage:   "disable dashboard access",
-						Before:  canRunCommands,
-						Action: func(c *cli.Context) error {
-
-							argumentError := checkArgumentsPresence(c, 1)
-							if argumentError != nil {
-								return argumentError
-							}
-
-							task := getCommandTask("disable_public_dashboard", "", true)
-							return cli.Exit(utils.ColorJsonString(task.Result.String), 0)
-
-						},
-					},
-				},
-			},
-		},
 	}
 
-	err := app.Run(os.Args)
+	if *db {
-	if err != nil {
+		printDbDetails()
-		log.Fatal(err)
+		os.Exit(0)
-	}
-}
-
-func canRunCommands(c *cli.Context) error {
-	if !utils.IsSystemReady() {
-		return cli.Exit(errorSystemNotReady, 1)
 	}
 
-	return nil
+	log.Printf("Starting edgeboxctl service for %s", *name)
-}
-
-func checkArgumentsPresence(c *cli.Context, count int) error {
-	if count != 0 {
-		for i := 0; i < count; i++ {
-			if c.Args().Get(i) == "" {
-				return cli.Exit(errorMissingApplicationSlug, 1)
-			}
-		}
-	}
-	return nil
-}
-
-func getCommandTask(taskSlug string, taskArgs string, execute bool) tasks.Task {
-	task := tasks.GetBaseTask(
-		taskSlug,
-		taskArgs,
-	)
-
-	if execute {
-		task = tasks.ExecuteTask(task)
-	}
-
-	return task
-}
-
-func startService() {
-	log.Printf("Starting edgeboxctl service")
 
 	// setup signal catching
 	sigs := make(chan os.Signal, 1)
@@ -328,6 +57,7 @@ func startService() {
 	}()
 
 	printVersion()
+
 	printDbDetails()
 
 	tick := 0
@@ -335,9 +65,9 @@ func startService() {
 	// infinite loop
 	for {
 
-		if utils.IsSystemReady() {
+		if isSystemReady() {
 			tick++ // Tick is an int, so eventually will "go out of ticks?" Maybe we want to reset the ticks every once in a while, to avoid working with big numbers...
-			systemIterator(tick)
+			systemIterator(name, tick)
 		} else {
 			// Wait about 60 seconds before trying again.
 			log.Printf("System not ready. Next try will be executed in 60 seconds")
@@ -345,6 +75,7 @@ func startService() {
 		}
 
 	}
+
 }
 
 // AppCleanup : cleanup app state before exit
@@ -366,7 +97,18 @@ func printDbDetails() {
 	)
 }
 
-func systemIterator(tick int) {
+// IsSystemReady : Checks hability of the service to execute commands (Only after "edgebox --build" is ran at least once via SSH, or if built for distribution)
+func isSystemReady() bool {
+	_, err := os.Stat("/home/system/components/ws/.ready")
+	return !os.IsNotExist(err)
+}
+
+// IsDatabaseReady : Checks is it can successfully connect to the task queue db
+func isDatabaseReady() bool {
+	return false
+}
+
+func systemIterator(name *string, tick int) {
 
 	log.Printf("Tick is %d", tick)
 
@@ -383,7 +125,7 @@ func systemIterator(tick int) {
 		log.Printf("No tasks to execute.")
 	}
 
-	// Wait about 1 second before resuming operations.
+	// Wait about 1 second before resumming operations.
 	log.Printf("Next instruction will be executed 1 second")
 	time.Sleep(defaultSleepTime)
 

go.mod

@@ -4,19 +4,14 @@ go 1.15
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
-	github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 // indirect
 	github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/joho/godotenv v1.3.0
-	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-sqlite3 v1.14.7 // indirect
-	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/shirou/gopsutil v3.21.4+incompatible // indirect
 	github.com/tklauser/go-sysconf v0.3.6 // indirect
-	github.com/urfave/cli/v2 v2.3.0 // indirect
+	golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549 // indirect
-	golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -1,18 +1,12 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY=
 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 h1:ZBbLwSJqkHBuFDA6DUhhse0IGJ7T5bemHyNILUjvOq4=
-github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2/go.mod h1:VSw57q4QFiWDbRnjdX8Cb3Ow0SFncRw+bA/ofY6Q83w=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2 h1:5EPE4Uk7ucthLTJAZqZxu6LZluox5/AqXUxJDpzgJjg=
 github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2/go.mod h1:NDZpkezJ8QqyIW/510MywB5T2KdC8v/0oTlEoPcMsRM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
@@ -24,25 +18,13 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
 github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shirou/gopsutil v3.21.4+incompatible h1:fuHcTm5mX+wzo542cmYcV9RTGQLbnHLI5SyQ5ryTVck=
 github.com/shirou/gopsutil v3.21.4+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -50,8 +32,6 @@ github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/
 github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
 github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA=
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
-github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
@@ -74,15 +54,9 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549 h1:OL5GcZ2XPkte3dpfuFQ9o884vrE3BZQhajdntNMruv4=
 golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a h1:ppl5mZgokTT8uPkmYOyEUmPTr3ypaKkg5eFOGrAmxxE=
-golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -93,7 +67,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

internal/diagnostics/diagnostics.go

@@ -1,18 +1,7 @@
 package diagnostics
 
-type ReleaseVersion string
-
 var Version string
+
 var Commit string
+
 var BuildDate string
-
-const (
-	DEV_VERSION   ReleaseVersion = "dev"
-	PROD_VERSION  ReleaseVersion = "prod"
-	CLOUD_VERSION ReleaseVersion = "cloud"
-	OTHER_VERSION ReleaseVersion = "other"
-)
-
-func GetReleaseVersion() ReleaseVersion {
-	return ReleaseVersion(Version)
-}

internal/edgeapps/edgeapps.go

@@ -81,8 +81,7 @@ func GetEdgeApp(ID string) MaybeEdgeApp {
 
 		myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath("edgeAppsPath") + ID + myEdgeAppServiceEnvFilename)
 		if err != nil {
-			// log.Println("No myedge.app environment file found. Status is Network-Only")
+			log.Println("No myedge.app environment file found. Status is Network-Only")
-			// File probably not found!
 		} else {
 			if myEdgeAppServiceEnv["INTERNET_URL"] != "" {
 				edgeAppInternetAccessible = true
@@ -236,7 +235,7 @@ func GetEdgeAppStatus(ID string) EdgeAppStatus {
 
 }
 
-// GetEdgeAppServices : Returns a list of services for a single edgeapp
+// GetEdgeAppServices : Returns a
 func GetEdgeAppServices(ID string) []EdgeAppService {
 
 	cmdArgs := []string{"-r", ".services | keys[]", utils.GetPath("edgeAppsPath") + ID + configFilename}
@@ -336,37 +335,6 @@ func DisableOnline(ID string) MaybeEdgeApp {
 
 }
 
-func EnablePublicDashboard(InternetURL string) bool {
-
-	envFilePath := utils.GetPath("apiPath") + myEdgeAppServiceEnvFilename
-	env, _ := godotenv.Unmarshal("INTERNET_URL=" + InternetURL)
-	_ = godotenv.Write(env, envFilePath)
-
-	buildFrameworkContainers()
-
-	return true
-
-}
-
-func DisablePublicDashboard() bool {
-	envFilePath := utils.GetPath("apiPath") + myEdgeAppServiceEnvFilename
-	if !IsPublicDashboard() {
-		log.Println("myedge.app environment file for the dashboard / api not found. No need to delete.")
-		return false
-	}
-
-	cmdArgs := []string{envFilePath}
-	utils.Exec(utils.GetPath("apiPath"), "rm", cmdArgs)
-	buildFrameworkContainers()
-	return true
-}
-
-func IsPublicDashboard() bool {
-	envFilePath := utils.GetPath("apiPath") + myEdgeAppServiceEnvFilename
-	_, err := godotenv.Read(envFilePath)
-	return err == nil
-}
-
 func buildFrameworkContainers() {
 
 	cmdArgs := []string{utils.GetPath("wsPath") + "ws", "--build"}

internal/storage/storage.go

@@ -6,25 +6,24 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 	"github.com/shirou/gopsutil/disk"
 )
 
 // Device : Struct representing a storage device in the system
 type Device struct {
-	ID         DeviceIdentifier `json:"id"`
+	ID         string       `json:"id"`
-	Name       string           `json:"name"`
+	Name       string       `json:"name"`
-	Size       string           `json:"size"`
+	Size       string       `json:"size"`
-	InUse      bool             `json:"in_use"`
+	InUse      bool         `json:"in_use"`
-	MainDevice bool             `json:"main_device"`
+	MainDevice bool         `json:"main_device"`
-	MAJ        string           `json:"maj"`
+	MAJ        string       `json:"maj"`
-	MIN        string           `json:"min"`
+	MIN        string       `json:"min"`
-	RM         string           `json:"rm"`
+	RM         string       `json:"rm"`
-	RO         string           `json:"ro"`
+	RO         string       `json:"ro"`
-	Partitions []Partition      `json:"partitions"`
+	Partitions []Partition  `json:"partitions"`
-	Status     DeviceStatus     `json:"status"`
+	Status     DeviceStatus `json:"status"`
-	UsageStat  UsageStat        `json:"usage_stat"`
+	UsageStat  UsageStat    `json:"usage_stat"`
 }
 
 // DeviceStatus : Struct representing possible storage device statuses (code + description)
@@ -67,27 +66,10 @@ type Partition struct {
 	UsageStat  UsageStat `json:"usage_stat"`
 }
 
-type DeviceIdentifier string
+const mainDiskID = "mmcblk0"
-
-const (
-	DISK_TYPE_SDA   DeviceIdentifier = "sda"
-	DISK_TYPE_MCBLK DeviceIdentifier = "mmcblk0"
-	DISK_TYPE_VDA   DeviceIdentifier = "vda"
-)
-
-func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
-	switch release_version {
-	case diagnostics.CLOUD_VERSION:
-		return DISK_TYPE_VDA
-	case diagnostics.PROD_VERSION:
-		return DISK_TYPE_MCBLK
-	}
-
-	return DISK_TYPE_SDA
-}
 
 // GetDevices : Returns a list of all available sotrage devices in structs filled with information
-func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
+func GetDevices() []Device {
 
 	var devices []Device
 
@@ -100,8 +82,6 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 	firstDevice := true
 	currentDeviceInUseFlag := false
 
-	mainDiskID := GetDeviceIdentifier(release_version)
-
 	for scanner.Scan() {
 		// 1 Device is represented here. Extract words in order for filling a Device struct
 		// Example deviceRawInfo: "mmcblk0 179:0 0 29.7G 0 disk"
@@ -142,7 +122,7 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
 			mainDevice := false
 
 			device := Device{
-				ID:         DeviceIdentifier(deviceRawInfo[0]),
+				ID:         deviceRawInfo[0],
 				Name:       deviceRawInfo[0],
 				Size:       deviceRawInfo[3],
 				MainDevice: mainDevice,

internal/storage/storage_test.go

@@ -7,37 +7,25 @@ import (
 )
 
 func TestGetDevices(t *testing.T) {
+	result := GetDevices()
 
-	t.Log("Testing with release version dev")
+	if len(result) == 0 {
-	assertGetDevices(GetDevices("dev"), t)
-	t.Log("Testing with release version prod")
-	assertGetDevices(GetDevices("prod"), t)
-	t.Log("Testing with release version cloud")
-	assertGetDevices(GetDevices("cloud"), t)
-
-}
-
-func assertGetDevices(devices []Device, t *testing.T) {
-
-	if len(devices) == 0 {
 		t.Log("Expecting at least 1 block device, 0 elements found in slice")
 		t.Fail()
 	}
 
 	foundDevice := false
 
-	t.Log("Looking for a mmcblk0, sda or dva device")
+	t.Log("Looking for a mmcblk0 or sda device")
-	for _, device := range devices {
+	for _, device := range result {
-
+		if device.ID == "mmcblk0" || device.ID == "sda" {
-		if device.ID == "mmcblk0" || device.ID == "sda" || device.ID == "vda" {
 			t.Log("Found target device", device.ID)
 			foundDevice = true
 		}
-
 	}
 
 	if !foundDevice {
-		t.Log("Expected to find device mmcblk0, sda or dva but did not. Devices:", devices)
+		t.Log("Expected to find device mmcblk0 but did not. Devices:", result)
 		t.Fail()
 	}
 }

internal/system/system.go

@@ -3,23 +3,16 @@ package system
 import (
 	"fmt"
 	"strconv"
-	"strings"
-
-	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 
 	"github.com/shirou/gopsutil/host"
-	"github.com/joho/godotenv"
-
 )
 
-// GetUptimeInSeconds: Returns a value (as string) of the total system uptime
 func GetUptimeInSeconds() string {
 	uptime, _ := host.Uptime()
 
 	return strconv.FormatUint(uptime, 10)
 }
 
-// GetUptimeFormatted: Returns a humanized version that can be useful for logging
 func GetUptimeFormatted() string {
 	uptime, _ := host.Uptime()
 
@@ -28,61 +21,3 @@ func GetUptimeFormatted() string {
 	minutes := ((uptime - (days * 60 * 60 * 24)) - (hours * 60 * 60)) / 60
 	return fmt.Sprintf("%d days, %d hours, %d minutes", days, hours, minutes)
 }
-
-// GetIP: Returns the ip address of the instance 
-func GetIP() string {
-	ip := ""
-
-	// Trying to find a valid IP (For direct connection, not tunneled)
-	ethResult := utils.ExecAndGetLines("/", "ip", []string{"-o", "-4", "addr", "list", "eth0"})
-	for ethResult.Scan() {
-		adapterRawInfo := strings.Fields(ethResult.Text())
-		if ip == "" {
-			ip = strings.Split(adapterRawInfo[3], "/")[0]
-		}
-	}
-
-	// If no IP was found yet, try wlan0
-	if ip == "" {
-		wlanResult := utils.ExecAndGetLines("/", "ip", []string{"-o", "-4", "addr", "list", "wlan0"})
-		for wlanResult.Scan() {
-			adapterRawInfo := strings.Fields(wlanResult.Text())
-			if ip == "" {
-				ip = strings.Split(adapterRawInfo[3], "/")[0]
-			}
-		}
-	}
-
-	return ip
-}
-
-func GetHostname() string {
-	return utils.Exec("/", "hostname", []string{})
-}
-
-// SetupCloudOptions: Reads the designated env file looking for options to write into the options table. Meant to be used on initial setup. Deletes source env file after operation.
-func SetupCloudOptions() {
-
-	var cloudEnv map[string]string
-	cloudEnv, err := godotenv.Read(utils.GetPath("cloudEnvFileLocation"))
-
-	if err != nil {
-		fmt.Println("Error loading .env file for cloud version setup")
-	}
-
-	if cloudEnv["NAME"] != "" {
-		utils.WriteOption("NAME", cloudEnv["NAME"])
-	}
-
-	if cloudEnv["EMAIL"] != "" {
-		utils.WriteOption("EMAIL", cloudEnv["EMAIL"])
-	}
-
-	if cloudEnv["EDGEBOXIO_API_TOKEN"] != "" {
-		utils.WriteOption("EDGEBOXIO_API_TOKEN", cloudEnv["EDGEBOXIO_API_TOKEN"])
-	}
-
-	// In the end of this operation takes place, remove the env file as to not overwrite any options once they are set.
-	utils.Exec("/", "rm", []string{utils.GetPath("cloudEnvFileLocation")})
-
-}

internal/tasks/tasks.go

@@ -60,32 +60,6 @@ type taskDisableOnlineArgs struct {
 	ID string `json:"id"`
 }
 
-type taskEnablePublicDashboardArgs struct {
-	InternetURL string `json:"internet_url"`
-}
-
-const STATUS_CREATED int = 0
-const STATUS_EXECUTING int = 1
-const STATUS_FINISHED int = 2
-const STATUS_ERROR int = 3
-
-func GetBaseTask(taskCode string, argsString string) Task {
-	currentFormattedTime := utils.GetFormattedDateTime(time.Now())
-	task := Task{
-		ID:   0,
-		Task: taskCode,
-		Args: sql.NullString{
-			String: argsString,
-			Valid:  true,
-		},
-		Status:  fmt.Sprintf("%d", STATUS_CREATED),
-		Created: currentFormattedTime,
-		Updated: currentFormattedTime,
-	}
-
-	return task
-}
-
 // GetNextTask : Performs a MySQL query over the device's Edgebox API
 func GetNextTask() Task {
 
@@ -136,18 +110,17 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	formatedDatetime := utils.GetFormattedDateTime(time.Now())
+	formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now())
 
-	_, err = statement.Exec(STATUS_EXECUTING, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement
+	_, err = statement.Exec(1, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement
 	if err != nil {
 		log.Fatal(err.Error())
 	}
 
-	if diagnostics.GetReleaseVersion() == diagnostics.DEV_VERSION {
+	if diagnostics.Version == "dev" {
 		log.Printf("Dev environemnt. Not executing tasks.")
 	} else {
-		// log.Println("Task: " + task.Task)
+		log.Println("Task: " + task.Task)
-		// log.Println("Args: " + task.Args.String)
 		switch task.Task {
 		case "setup_tunnel":
 
@@ -161,12 +134,6 @@ func ExecuteTask(task Task) Task {
 				task.Result = sql.NullString{String: taskResult, Valid: true}
 			}
 
-		case "list_edgeapps":
-
-			log.Println("Fetching current status on Edgeapps...")
-			taskResult := taskGetEdgeApps()
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-
 		case "install_edgeapp":
 
 			log.Println("Installing EdgeApp...")
@@ -239,24 +206,6 @@ func ExecuteTask(task Task) Task {
 				task.Result = sql.NullString{String: taskResult, Valid: true}
 			}
 
-		case "enable_public_dashboard":
-
-			log.Println("Enabling online access to Dashboard...")
-			var args taskEnablePublicDashboardArgs
-			err := json.Unmarshal([]byte(task.Args.String), &args)
-			if err != nil {
-				log.Printf("Error reading arguments of enable_public_dashboard task: %s", err)
-			} else {
-				taskResult := taskEnablePublicDashboard(args)
-				task.Result = sql.NullString{String: taskResult, Valid: true}
-			}
-
-		case "disable_public_dashboard":
-
-			log.Println("Disabling online access to Dashboard...")
-			taskResult := taskDisablePublicDashboard()
-			task.Result = sql.NullString{String: taskResult, Valid: true}
-
 		}
 
 	}
@@ -269,15 +218,16 @@ func ExecuteTask(task Task) Task {
 		log.Fatal(err.Error())
 	}
 
-	formatedDatetime = utils.GetFormattedDateTime(time.Now())
+	formatedDatetime = utils.GetSQLiteFormattedDateTime(time.Now())
 
 	if task.Result.Valid {
-		_, err = statement.Exec(STATUS_FINISHED, task.Result.String, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with result info
+		_, err = statement.Exec(2, task.Result.String, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with result info
 		if err != nil {
 			log.Fatal(err.Error())
 		}
+
 	} else {
-		_, err = statement.Exec(STATUS_ERROR, "Error", formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with Error info
+		_, err = statement.Exec(3, "Error", formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with Error info
 		if err != nil {
 			log.Fatal(err.Error())
 		}
@@ -300,26 +250,6 @@ func ExecuteSchedules(tick int) {
 
 	if tick == 1 {
 
-		ip := taskGetSystemIP()
-		log.Println("System IP is: " + ip)
-
-		release := taskSetReleaseVersion()
-		log.Println("Setting api option flag for Edgeboxctl (" + release + " version)")
-
-		hostname := taskGetHostname()
-		log.Println("Hostname is " + hostname)
-
-		// if diagnostics.Version == "cloud" && !edgeapps.IsPublicDashboard() {
-		// 	taskEnablePublicDashboard(taskEnablePublicDashboardArgs{
-		// 		InternetURL: hostname + ".myedge.app",
-		// 	})
-		// }
-
-		if diagnostics.GetReleaseVersion() == diagnostics.CLOUD_VERSION {
-			log.Println("Setting up cloud version options (name, email, api token)")
-			taskSetupCloudOptions()
-		}
-
 		// Executing on startup (first tick). Schedules run before tasks in the SystemIterator
 		uptime := taskGetSystemUptime()
 		log.Println("Uptime is " + uptime + " seconds (" + system.GetUptimeFormatted() + ")")
@@ -331,18 +261,18 @@ func ExecuteSchedules(tick int) {
 
 	if tick%5 == 0 {
 		// Executing every 5 ticks
-		taskGetSystemUptime()
 		log.Println(taskGetStorageDevices())
 	}
 
 	if tick%30 == 0 {
 		// Executing every 30 ticks
 		log.Println(taskGetEdgeApps())
+
 	}
 
 	if tick%60 == 0 {
-		ip := taskGetSystemIP()
+		// Every 60 ticks...
-		log.Println("System IP is: " + ip)
+
 	}
 
 	// Just add a schedule here if you need a custom one (every "tick hour", every "tick day", etc...)
@@ -350,7 +280,8 @@ func ExecuteSchedules(tick int) {
 }
 
 func taskSetupTunnel(args taskSetupTunnelArgs) string {
-	// // fmt.Println("Executing taskSetupTunnel")
+
+	fmt.Println("Executing taskSetupTunnel")
 
 	cmdargs := []string{"gen", "--name", args.NodeName, "--token", args.BootnodeToken, args.BootnodeAddress + ":8655", "--prefix", args.AssignedAddress}
 	utils.Exec(utils.GetPath("wsPath"), "tinc-boot", cmdargs)
@@ -363,145 +294,181 @@ func taskSetupTunnel(args taskSetupTunnelArgs) string {
 
 	output := "OK" // Better check / logging of command execution result.
 	return output
+
 }
 
 func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
-	// fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
+
+	fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
 
 	result := edgeapps.SetEdgeAppInstalled(args.ID)
+
 	resultJSON, _ := json.Marshal(result)
 
 	taskGetEdgeApps()
+
 	return string(resultJSON)
+
 }
 
 func taskRemoveEdgeApp(args taskRemoveEdgeAppArgs) string {
-	// fmt.Println("Executing taskRemoveEdgeApp for " + args.ID)
+
+	fmt.Println("Executing taskRemoveEdgeApp for " + args.ID)
 
 	// Making sure the application is stopped before setting it as removed.
 	edgeapps.StopEdgeApp(args.ID)
 	result := edgeapps.SetEdgeAppNotInstalled(args.ID)
+
 	resultJSON, _ := json.Marshal(result)
 
 	taskGetEdgeApps()
+
 	return string(resultJSON)
+
 }
 
 func taskStartEdgeApp(args taskStartEdgeAppArgs) string {
-	// fmt.Println("Executing taskStartEdgeApp for " + args.ID)
+
+	fmt.Println("Executing taskStartEdgeApp for " + args.ID)
 
 	result := edgeapps.RunEdgeApp(args.ID)
+
 	resultJSON, _ := json.Marshal(result)
 
 	taskGetEdgeApps() // This task will imediatelly update the entry in the api database.
+
 	return string(resultJSON)
+
 }
 
 func taskStopEdgeApp(args taskStopEdgeAppArgs) string {
-	// fmt.Println("Executing taskStopEdgeApp for " + args.ID)
+
+	fmt.Println("Executing taskStopEdgeApp for " + args.ID)
 
 	result := edgeapps.StopEdgeApp(args.ID)
+
 	resultJSON, _ := json.Marshal(result)
 
 	taskGetEdgeApps() // This task will imediatelly update the entry in the api database.
+
 	return string(resultJSON)
+
 }
 
 func taskEnableOnline(args taskEnableOnlineArgs) string {
-	// fmt.Println("Executing taskEnableOnline for " + args.ID)
+
+	fmt.Println("Executing taskEnableOnline for " + args.ID)
 
 	result := edgeapps.EnableOnline(args.ID, args.InternetURL)
+
 	resultJSON, _ := json.Marshal(result)
 
 	taskGetEdgeApps()
+
 	return string(resultJSON)
+
 }
 
 func taskDisableOnline(args taskDisableOnlineArgs) string {
-	// fmt.Println("Executing taskDisableOnline for " + args.ID)
+
+	fmt.Println("Executing taskDisableOnline for " + args.ID)
 
 	result := edgeapps.DisableOnline(args.ID)
+
 	resultJSON, _ := json.Marshal(result)
 
 	taskGetEdgeApps()
+
 	return string(resultJSON)
-}
 
-func taskEnablePublicDashboard(args taskEnablePublicDashboardArgs) string {
-	// fmt.Println("Enabling taskEnablePublicDashboard")
-	result := edgeapps.EnablePublicDashboard(args.InternetURL)
-	if result {
-
-		utils.WriteOption("PUBLIC_DASHBOARD", args.InternetURL)
-		return "{result: true}"
-
-	}
-
-	return "{result: false}"
-}
-
-func taskDisablePublicDashboard() string {
-	// fmt.Println("Executing taskDisablePublicDashboard")
-	result := edgeapps.DisablePublicDashboard()
-	utils.WriteOption("PUBLIC_DASHBOARD", "")
-	if result {
-		return "{result: true}"
-	}
-	return "{result: false}"
-}
-
-func taskSetReleaseVersion() string {
-
-	// fmt.Println("Executing taskSetReleaseVersion")
-
-	utils.WriteOption("RELEASE_VERSION", diagnostics.Version)
-
-	return diagnostics.Version
 }
 
 func taskGetEdgeApps() string {
-	// fmt.Println("Executing taskGetEdgeApps")
+
+	fmt.Println("Executing taskGetEdgeApps")
 
 	edgeApps := edgeapps.GetEdgeApps()
 	edgeAppsJSON, _ := json.Marshal(edgeApps)
 
-	utils.WriteOption("EDGEAPPS_LIST", string(edgeAppsJSON))
+	db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails())
+
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now())
+
+	_, err = statement.Exec("EDGEAPPS_LIST", string(edgeAppsJSON), formatedDatetime, formatedDatetime) // Execute SQL Statement
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	db.Close()
+
 	return string(edgeAppsJSON)
+
 }
 
 func taskGetSystemUptime() string {
-	// fmt.Println("Executing taskGetSystemUptime")
+	fmt.Println("Executing taskGetSystemUptime")
+
 	uptime := system.GetUptimeInSeconds()
-	utils.WriteOption("SYSTEM_UPTIME", uptime)
+
+	db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails())
+
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now())
+
+	_, err = statement.Exec("SYSTEM_UPTIME", uptime, formatedDatetime, formatedDatetime) // Execute SQL Statement
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	db.Close()
+
 	return uptime
+
 }
 
 func taskGetStorageDevices() string {
-	// fmt.Println("Executing taskGetStorageDevices")
+	fmt.Println("Executing taskGetStorageDevices")
 
-	devices := storage.GetDevices(diagnostics.GetReleaseVersion())
+	devices := storage.GetDevices()
 	devicesJSON, _ := json.Marshal(devices)
 
-	utils.WriteOption("STORAGE_DEVICES_LIST", string(devicesJSON))
+	db, err := sql.Open("sqlite3", utils.GetSQLiteDbConnectionDetails())
+
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now())
+
+	_, err = statement.Exec("STORAGE_DEVICES_LIST", devicesJSON, formatedDatetime, formatedDatetime) // Execute SQL Statement
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	db.Close()
 
 	return string(devicesJSON)
-}
 
-func taskGetSystemIP() string {
-	// fmt.Println("Executing taskGetStorageDevices")
-	ip := system.GetIP()
-	utils.WriteOption("IP_ADDRESS", ip)
-	return ip
-}
-
-func taskGetHostname() string {
-	// fmt.Println("Executing taskGetHostname")
-	hostname := system.GetHostname()
-	utils.WriteOption("HOSTNAME", hostname)
-	return hostname
-}
-
-func taskSetupCloudOptions() {
-	// fmt.Println("Executing taskSetupCloudOptions")
-	system.SetupCloudOptions()
 }

internal/utils/utils.go

@@ -3,8 +3,6 @@ package utils
 import (
 	"bufio"
 	"bytes"
-	"database/sql"
-	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -13,7 +11,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/TylerBrock/colorjson"
 	"github.com/joho/godotenv"
 )
 
@@ -93,8 +90,8 @@ func GetSQLiteDbConnectionDetails() string {
 
 }
 
-// GetFormattedDateTime: Given a Time, Returns a string that is formatted to be passed around the application, including correctly inserting SQLite Datetime field using sql.Prepare.
+// GetSQLiteFormattedDateTime: Given a Time, Returns a string that is formatted ready to be inserted into an SQLite Datetime field using sql.Prepare.
-func GetFormattedDateTime(t time.Time) string {
+func GetSQLiteFormattedDateTime(t time.Time) string {
 	// This date is used to indicate the layout.
 	const datetimeLayout = "2006-01-02 15:04:05"
 	formatedDatetime := t.Format(datetimeLayout)
@@ -115,14 +112,6 @@ func GetPath(pathKey string) string {
 	}
 
 	switch pathKey {
-	case "cloudEnvFileLocation":
-
-		if env["CLOUD_ENV_FILE_LOCATION"] != "" {
-			targetPath = env["CLOUD_ENV_FILE_LOCATION"]
-		} else {
-			targetPath = "/home/system/components/edgeboxctl/cloud.env"
-		}
-
 	case "apiEnvFileLocation":
 
 		if env["API_ENV_FILE_LOCATION"] != "" {
@@ -131,14 +120,6 @@ func GetPath(pathKey string) string {
 			targetPath = "/home/system/components/api/edgebox.env"
 		}
 
-	case "apiPath":
-
-		if env["API_PATH"] != "" {
-			targetPath = env["APT_PATH"]
-		} else {
-			targetPath = "/home/system/components/api/"
-		}
-
 	case "edgeAppsPath":
 
 		if env["EDGEAPPS_PATH"] != "" {
@@ -164,45 +145,3 @@ func GetPath(pathKey string) string {
 	return targetPath
 
 }
-
-// WriteOption : Writes a key value pair option into the api shared database
-func WriteOption(optionKey string, optionValue string) {
-
-	db, err := sql.Open("sqlite3", GetSQLiteDbConnectionDetails())
-
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	statement, err := db.Prepare("REPLACE into option (name, value, created, updated) VALUES (?, ?, ?, ?);") // Prepare SQL Statement
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	formatedDatetime := GetFormattedDateTime(time.Now())
-
-	_, err = statement.Exec(optionKey, optionValue, formatedDatetime, formatedDatetime) // Execute SQL Statement
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	db.Close()
-}
-
-// IsSystemReady : Checks readiness of the service to execute commands (Only after "edgebox --build" is ran at least once via SSH, or if built for distribution)
-func IsSystemReady() bool {
-	_, err := os.Stat(GetPath("wsPath") + ".ready")
-	return !os.IsNotExist(err)
-}
-
-// IsDatabaseReady : Checks is it can successfully connect to the task queue db
-func IsDatabaseReady() bool {
-	return false
-}
-
-func ColorJsonString(jsonString string) string {
-	var obj map[string]interface{}
-	json.Unmarshal([]byte(jsonString), &obj)
-	resultJSON, _ := colorjson.Marshal(obj)
-	return string(resultJSON)
-}

internal/utils/utils_test.go

@@ -97,9 +97,9 @@ func TestGetPath(t *testing.T) {
 	}
 }
 
-func TestGetFormattedDateTime(t *testing.T) {
+func TestGetSQLiteFormattedDateTime(t *testing.T) {
 	datetime := time.Date(2021, time.Month(1), 01, 1, 30, 15, 0, time.UTC)
-	result := GetFormattedDateTime(datetime)
+	result := GetSQLiteFormattedDateTime(datetime)
 
 	if result != "2021-01-01 01:30:15" {
 		t.Log("Expected 2021-01-01 01:30:15 but got ", result)