Skip to content

Commit

Permalink
Merge branch 'HaipIsLocked' into 'master'
Browse files Browse the repository at this point in the history
Add isLocked property to HA-IP

See merge request transip/restapi-php-library!128
  • Loading branch information
dionbosschieter committed Jan 18, 2021
2 parents abc1fa2 + 71282ee commit 764955f
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
CHANGELOG
=========

6.5.0
-----
* Added isLocked property to HA-IP

6.4.0
-----
* Added UUID property to VPS
Expand Down
8 changes: 8 additions & 0 deletions ci/deploy_to_github.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ if [ -z "$GITHUB_TOKEN" ] ; then
echo "we need a github token in order to proceed";
exit 1;
fi
if [ -z "$CI_REPOSITORY_URL" ] ; then
echo "we need a repository url to proceed";
exit 1;
fi

# force a full clone, instead of expecting a non shallow cloned repository
git clone $CI_REPOSITORY_URL /tmp/repository
cd /tmp/repository

# Remove the default origin/HEAD -> origin/master ref
# as github shows this as new branch
Expand Down
10 changes: 10 additions & 0 deletions src/Entity/Haip.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ class Haip extends AbstractEntity
*/
protected $tlsMode;

/**
* @var bool
*/
protected $isLocked;

public function getName(): string
{
return $this->name;
Expand Down Expand Up @@ -235,4 +240,9 @@ public function setTlsMode(string $tlsMode): void
{
$this->tlsMode = $tlsMode;
}

public function isLocked(): bool
{
return $this->isLocked;
}
}
2 changes: 1 addition & 1 deletion src/TransipAPI.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
class TransipAPI
{
public const TRANSIP_API_ENDPOINT = "https://api.transip.nl/v6";
public const TRANSIP_API_LIBRARY_VERSION = "6.4.0";
public const TRANSIP_API_LIBRARY_VERSION = "6.5.0";
public const TRANSIP_API_DEMO_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6ImN3MiFSbDU2eDNoUnkjelM4YmdOIn0.eyJpc3MiOiJhcGkudHJhbnNpcC5ubCIsImF1ZCI6ImFwaS50cmFuc2lwLm5sIiwianRpIjoiY3cyIVJsNTZ4M2hSeSN6UzhiZ04iLCJpYXQiOjE1ODIyMDE1NTAsIm5iZiI6MTU4MjIwMTU1MCwiZXhwIjoyMTE4NzQ1NTUwLCJjaWQiOiI2MDQ0OSIsInJvIjpmYWxzZSwiZ2siOmZhbHNlLCJrdiI6dHJ1ZX0.fYBWV4O5WPXxGuWG-vcrFWqmRHBm9yp0PHiYh_oAWxWxCaZX2Rf6WJfc13AxEeZ67-lY0TA2kSaOCp0PggBb_MGj73t4cH8gdwDJzANVxkiPL1Saqiw2NgZ3IHASJnisUWNnZp8HnrhLLe5ficvb1D9WOUOItmFC2ZgfGObNhlL2y-AMNLT4X7oNgrNTGm-mespo0jD_qH9dK5_evSzS3K8o03gu6p19jxfsnIh8TIVRvNdluYC2wo4qDl5EW5BEZ8OSuJ121ncOT1oRpzXB0cVZ9e5_UVAEr9X3f26_Eomg52-PjrgcRJ_jPIUYbrlo06KjjX2h0fzMr21ZE023Gw";

/**
Expand Down

0 comments on commit 764955f

Please sign in to comment.