Skip to content

Commit

Permalink
Merge a534667 into b3f7f93
Browse files Browse the repository at this point in the history
  • Loading branch information
@typhonius
typhonius committed Mar 4, 2020
2 parents b3f7f93 + a534667 commit 79ba16c
Show file tree
Hide file tree
Showing 37 changed files with 433 additions and 247 deletions.
7 changes: 2 additions & 5 deletions src/Connector/Client.php
View file
Expand Up @@ -51,12 +51,9 @@ public static function factory(ConnectorInterface $connector)
/**
* @inheritdoc
*/
public function request(string $verb, string $path, array $options = [])
public function request(string $verb, string $path)
{
// @TODO follow this up by removing $options from the parameters able
// to be passed into this function and instead solely relying on the
// addOption() method as this can then be tested.
$options = $this->options + $options;
$options = $this->options;
$options['query'] = $this->query;

if (!empty($options['query']['filter']) && is_array($options['query']['filter'])) {
Expand Down
3 changes: 1 addition & 2 deletions src/Connector/ClientInterface.php
View file
Expand Up @@ -19,11 +19,10 @@ interface ClientInterface
*
* @param string $verb
* @param string $path
* @param array $options
*
* @return mixed|StreamInterface
*/
public function request(string $verb, string $path, array $options = []);
public function request(string $verb, string $path);

/**
* @param string $verb
Expand Down
21 changes: 7 additions & 14 deletions src/Endpoints/Applications.php
View file
Expand Up @@ -52,17 +52,12 @@ public function get($applicationUuid)
public function rename($applicationUuid, $name)
{

$options = [
'form_params' => [
'name' => $name,
],
];
$this->client->addOption('form_params', ['name' => $name]);

return new OperationResponse(
$this->client->request(
'put',
"/applications/${applicationUuid}",
$options
"/applications/${applicationUuid}"
)
);
}
Expand Down Expand Up @@ -95,18 +90,16 @@ public function getAllTags($applicationUuid)
public function createTag($applicationUuid, $name, $color)
{

$options = [
'form_params' => [
'name' => $name,
'color' => $color,
],
$params = [
'name' => $name,
'color' => $color,
];
$this->client->addOption('form_params', $params);

return new OperationResponse(
$this->client->request(
'post',
"/applications/${applicationUuid}/tags",
$options
"/applications/${applicationUuid}/tags"
)
);
}
Expand Down
21 changes: 7 additions & 14 deletions src/Endpoints/Code.php
View file
Expand Up @@ -39,17 +39,12 @@ public function getAll($applicationUuid)
public function switch($environmentUuid, $branch)
{

$options = [
'form_params' => [
'branch' => $branch,
],
];
$this->client->addOption('form_params', ['branch' => $branch]);

return new OperationResponse(
$this->client->request(
'post',
"/environments/${environmentUuid}/code/actions/switch",
$options
"/environments/${environmentUuid}/code/actions/switch"
)
);
}
Expand All @@ -64,18 +59,16 @@ public function switch($environmentUuid, $branch)
public function deploy($environmentFromUuid, $environmentToUuid, $commitMessage = null)
{

$options = [
'form_params' => [
'source' => $environmentFromUuid,
'message' => $commitMessage,
],
$params = [
'source' => $environmentFromUuid,
'message' => $commitMessage,
];
$this->client->addOption('form_params', $params);

return new OperationResponse(
$this->client->request(
'post',
"/environments/${environmentToUuid}/code",
$options
"/environments/${environmentToUuid}/code"
)
);
}
Expand Down
30 changes: 14 additions & 16 deletions src/Endpoints/Crons.php
View file
Expand Up @@ -60,17 +60,16 @@ public function get($environmentUuid, $cronId)
public function create($environmentUuid, $command, $frequency, $label, $serverId = null)
{

$options = [
'form_params' => [
'command' => $command,
'frequency' => $frequency,
'label' => $label,
'server_id' => $serverId
],
$params = [
'command' => $command,
'frequency' => $frequency,
'label' => $label,
'server_id' => $serverId
];
$this->client->addOption('form_params', $params);

return new OperationResponse(
$this->client->request('post', "/environments/${environmentUuid}/crons", $options)
$this->client->request('post', "/environments/${environmentUuid}/crons")
);
}

Expand All @@ -88,17 +87,16 @@ public function create($environmentUuid, $command, $frequency, $label, $serverId
public function update($environmentUuid, $cronId, $command, $frequency, $label, $serverId = null)
{

$options = [
'form_params' => [
'command' => $command,
'frequency' => $frequency,
'label' => $label,
'server_id' => $serverId
],
$params = [
'command' => $command,
'frequency' => $frequency,
'label' => $label,
'server_id' => $serverId
];
$this->client->addOption('form_params', $params);

return new OperationResponse(
$this->client->request('post', "/environments/${environmentUuid}/crons/${cronId}", $options)
$this->client->request('post', "/environments/${environmentUuid}/crons/${cronId}")
);
}

Expand Down
20 changes: 8 additions & 12 deletions src/Endpoints/Databases.php
View file
Expand Up @@ -38,14 +38,11 @@ public function getAll($applicationUuid)
*/
public function create($applicationUuid, $name)
{
$options = [
'form_params' => [
'name' => $name,
],
];

$this->client->addOption('form_params', ['name' => $name]);

return new OperationResponse(
$this->client->request('post', "/applications/${applicationUuid}/databases", $options)
$this->client->request('post', "/applications/${applicationUuid}/databases")
);
}

Expand Down Expand Up @@ -93,15 +90,14 @@ public function truncate($applicationUuid, $name)
*/
public function copy($environmentFromUuid, $dbName, $environmentToUuid)
{
$options = [
'form_params' => [
'name' => $dbName,
'source' => $environmentFromUuid,
],
$params = [
'name' => $dbName,
'source' => $environmentFromUuid,
];
$this->client->addOption('form_params', $params);

return new OperationResponse(
$this->client->request('post', "/environments/${environmentToUuid}/databases", $options)
$this->client->request('post', "/environments/${environmentToUuid}/databases")
);
}
}
17 changes: 4 additions & 13 deletions src/Endpoints/Domains.php
View file
Expand Up @@ -58,14 +58,10 @@ public function get($environmentUuid, $domain)
public function create($environmentUuid, $hostname)
{

$options = [
'form_params' => [
'hostname' => $hostname,
],
];
$this->client->addOption('form_params', ['hostname' => $hostname]);

return new OperationResponse(
$this->client->request('post', "/environments/${environmentUuid}/domains", $options)
$this->client->request('post', "/environments/${environmentUuid}/domains")
);
}

Expand Down Expand Up @@ -93,17 +89,12 @@ public function delete($environmentUuid, $domain)
public function purge($environmentUuid, array $domains)
{

$options = [
'form_params' => [
'domains' => $domains,
],
];
$this->client->addOption('form_params', ['domains' => $domains]);

return new OperationResponse(
$this->client->request(
'post',
"/environments/${environmentUuid}/domains/actions/clear-varnish",
$options
"/environments/${environmentUuid}/domains/actions/clear-varnish"
)
);
}
Expand Down
48 changes: 15 additions & 33 deletions src/Endpoints/Environments.php
View file
Expand Up @@ -23,14 +23,11 @@ class Environments extends CloudApiBase implements CloudApiInterface
*/
public function copyFiles($environmentUuidFrom, $environmentUuidTo)
{
$options = [
'form_params' => [
'source' => $environmentUuidFrom,
],
];

$this->client->addOption('form_params', ['source' => $environmentUuidFrom]);

return new OperationResponse(
$this->client->request('post', "/environments/${environmentUuidTo}/files", $options)
$this->client->request('post', "/environments/${environmentUuidTo}/files")
);
}

Expand Down Expand Up @@ -76,15 +73,12 @@ public function getAll($applicationUuid)
public function update($environmentUuid, array $config)
{

$options = [
'form_params' => $config,
];
$this->client->addOption('form_params', $config);

return new OperationResponse(
$this->client->request(
'put',
"/environments/${environmentUuid}",
$options
"/environments/${environmentUuid}"
)
);
}
Expand All @@ -99,17 +93,12 @@ public function update($environmentUuid, array $config)
public function rename($environmentUuid, $label)
{

$options = [
'form_params' => [
'label' => $label,
],
];
$this->client->addOption('form_params', ['label' => $label]);

return new OperationResponse(
$this->client->request(
'post',
"/environments/${environmentUuid}/actions/change-label",
$options
"/environments/${environmentUuid}/actions/change-label"
)
);
}
Expand All @@ -136,17 +125,12 @@ public function enableLiveDev($environmentUuid)
public function disableLiveDev($environmentUuid)
{

$options = [
'form_params' => [
'discard' => 1,
],
];
$this->client->addOption('form_params', ['discard' => 1]);

return new OperationResponse(
$this->client->request(
'post',
"/environments/${environmentUuid}/livedev/actions/disable",
$options
"/environments/${environmentUuid}/livedev/actions/disable"
)
);
}
Expand Down Expand Up @@ -194,19 +178,17 @@ public function disableProductionMode($environmentUuid)
*/
public function create($applicationUuid, $label, $branch, array $databases)
{
$options = [
'form_params' => [
'label' => $label,
'branch' => $branch,
'databases' => $databases,
],
$params = [
'label' => $label,
'branch' => $branch,
'databases' => $databases,
];
$this->client->addOption('form_params', $params);

return new OperationResponse(
$this->client->request(
'post',
"/applications/${applicationUuid}/environments",
$options
"/applications/${applicationUuid}/environments"
)
);
}
Expand Down
16 changes: 7 additions & 9 deletions src/Endpoints/IdentityProviders.php
View file
Expand Up @@ -106,20 +106,18 @@ public function enable($idpUuid)
public function update($idpUuid, $label, $entityId, $ssoUrl, $certificate)
{

$options = [
'form_params' => [
'label' => $label,
'entity_id' => $entityId,
'sso_url' => $ssoUrl,
'certificate' => $certificate,
],
$params = [
'label' => $label,
'entity_id' => $entityId,
'sso_url' => $ssoUrl,
'certificate' => $certificate,
];
$this->client->addOption('form_params', $params);

return new OperationResponse(
$this->client->request(
'put',
"/identity-providers/${idpUuid}",
$options
"/identity-providers/${idpUuid}"
)
);
}
Expand Down
8 changes: 2 additions & 6 deletions src/Endpoints/Ides.php
View file
Expand Up @@ -56,14 +56,10 @@ public function get($ideUuid)
public function create($applicationUuid, $name)
{

$options = [
'form_params' => [
'name' => $name,
],
];
$this->client->addOption('form_params', ['name' => $name]);

return new OperationResponse(
$this->client->request('post', "/applications/${applicationUuid}/ides", $options)
$this->client->request('post', "/applications/${applicationUuid}/ides")
);
}

Expand Down

0 comments on commit 79ba16c

Please sign in to comment.