Skip to content
Snippets Groups Projects

[https://gitlab.cern.ch/wordpress/paas/wordpress-operator/-/issues/49] Enable fluentformpro

Open [https://gitlab.cern.ch/wordpress/paas/wordpress-operator/-/issues/49] Enable fluentformpro
fluentformpro into mvp
3 unresolved threads
Open Carina Antunes requested to merge fluentformpro into mvp
3 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
app/scripts/entrypoint.sh
16 16 # Set or update options
17 17 source /usr/share/container-scripts/set-options.sh
18 18
19 # Licensing Activation
20 source /usr/share/container-scripts/license_activation.sh
  • Carina Antunes
    Carina Antunes @crdeoliv
    Author Maintainer

    I would suggest we move it to the install script, wdyt?

  • Thomas Ferfelis
    Thomas Ferfelis @tferfeli
    Developer

    I moved it to entrypoint to be consistent with set options as it is "somehow" plugin modification which can happen at any time. Also the license key might expire and need to change at some point so a deployment restart should be enough to re activate. Isn't the install script run on the initial installation of every wordpress instance?

    Edited by Thomas Ferfelis
  • Please register or sign in to reply
  • Thomas Ferfelis changed title from Enable fluentformpro to {+[https://gitlab.cern.ch/wordpress/paas/wordpress-operator/-/issues/49] +}Enable fluentformpro

    changed title from Enable fluentformpro to {+[https://gitlab.cern.ch/wordpress/paas/wordpress-operator/-/issues/49] +}Enable fluentformpro

  • Thomas Ferfelis requested review from @crdeoliv and @jyde

    requested review from @crdeoliv and @jyde

  • Thomas Ferfelis assigned to @crdeoliv and @tferfeli

    assigned to @crdeoliv and @tferfeli

  • Francisco Borges Aurindo Barros
    Francisco Borges Aurindo Barros @fborgesa started a thread on the diff
    • app/scripts/license_activation.sh 0 → 100644
    1 #!/bin/bash
    2
  • Francisco Borges Aurindo Barros
    Francisco Borges Aurindo Barros @fborgesa started a thread on the diff
    • app/scripts/license_activation.sh 0 → 100644
    1 #!/bin/bash
    2
    3 configure_license_plugins() {
    4 echo "--> Configuring Plugin Licensing..."
    5
    • Francisco Borges Aurindo Barros
      Francisco Borges Aurindo Barros @fborgesa
      Owner

      I would have an assertion beforehand to make sure this is set, if the variable is empty (for any reason), we will be overwriting with an empty key:

      Suggested change
      8
      8 if [ -z "${FLUENTFORM_PRO_LICENSE_KEY}" ]; then
      9 echo "FluentForm license key empty, not continuing..."
      10 exit 0; # Or exit 1, if we want the script to fail
      11 fi
    • Thomas Ferfelis
      Thomas Ferfelis @tferfeli
      Developer

      Regarding this proposal. The current solution mentioned in here. If we don't provide a key at all it brings up an invalid one as a default which results to this image. It seems failure is prevented on non key or invalid. Do you think the set +e will be needed without the above logic?

    • Francisco Borges Aurindo Barros
      Francisco Borges Aurindo Barros @fborgesa
      Owner

      To clarify, the Validating License... etc. is done by the wp fluentform activate_license command.

      That is indeed good enough IMHO (and good to see it does that), however my only question is: What happens if it had a valid license, then we changed to an empty/invalid one, and runs this command? Does it keep the old state? (If it does not, then maybe there is still value in having the assertion above).

      Do you think the set +e will be needed without the above logic?

      I don't think so, this looks good! :thumbsup:

    • Thomas Ferfelis
      Thomas Ferfelis @tferfeli
      Developer

      I don't know how that scenario would take place because the value will be overridden from ok4 argo config values and it will exist on a vault. As of results i have some regarding validation which surprised me as well. Initially i thought it would invalidate the key if dummy key enforced. But it seems since its not valid it doesn't change. image

    • Please register or sign in to reply
  • Francisco Borges Aurindo Barros left review comments

    left review comments

  • Thomas Ferfelis added 1 commit

    added 1 commit

    Compare with previous version

  • Thomas Ferfelis added 3 commits

    added 3 commits

    Compare with previous version

  • Thomas Ferfelis requested review from @fborgesa

    requested review from @fborgesa

    • Please register or sign in to reply